From ea58ebe76d1854b0b42ad960a3d3e61203e7a3c5 Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Mon, 9 Jan 2017 15:33:25 +0800 Subject: [PATCH] Visual Studio builds: Move project files to win32/ It was suggested that the project files to be moved to win32/, so that we can have one less layer of directories we need to go down into to reach the project files. --- Makefile.am | 2 +- build/Makefile-newvs.am | 47 ------ build/Makefile.am | 5 - build/Makefile.msvcproj | 154 ------------------ build/win32/vs12/gsk-4.vcxproj.filtersin | 39 ----- build/win32/vs12/gtk-4.vcxproj.filtersin | 46 ------ .../vs12/gtk4-builder-tool.vcxproj.filters | 20 --- build/win32/vs12/gtk4-gen-srcs.props | 100 ------------ .../vs12/gtk4-query-settings.vcxproj.filters | 20 --- configure.ac | 9 +- demos/gtk-demo/Makefile.am | 6 +- demos/icon-browser/Makefile.am | 4 +- gdk/Makefile.am | 16 +- gdk/win32/Makefile.am | 6 +- gsk/Makefile.am | 22 +-- gtk/Makefile.am | 12 +- win32/Makefile-newvs.am | 46 ++++++ {build/win32 => win32}/Makefile.am | 2 +- {build => win32}/Makefile.msvc-introspection | 64 ++++---- win32/Makefile.msvcproj | 153 +++++++++++++++++ {build/win32 => win32}/detectenv-msvc.mak | 0 {build/win32 => win32}/gen-enums.batin | 2 +- .../gtk-introspection-msvc.mak | 0 {build/win32 => win32}/gtkpc.py | 0 {build/win32 => win32}/introspection-msvc.mak | 2 +- {build/win32 => win32}/pc_base.py | 2 +- {build/win32 => win32}/replace.py | 0 {build/win32 => win32}/vs12/Makefile.am | 6 +- {build/win32 => win32}/vs12/README.txt | 0 .../vs12/gdk-4.vcxproj.filtersin | 2 +- {build/win32 => win32}/vs12/gdk-4.vcxprojin | 10 +- .../vs12/gdk4-win32.vcxproj.filtersin | 0 .../win32 => win32}/vs12/gdk4-win32.vcxprojin | 8 +- win32/vs12/gsk-4.vcxproj.filtersin | 39 +++++ {build/win32 => win32}/vs12/gsk-4.vcxprojin | 66 ++++---- {build/win32 => win32}/vs12/gtk+-4.sln | 0 win32/vs12/gtk-4.vcxproj.filtersin | 46 ++++++ {build/win32 => win32}/vs12/gtk-4.vcxprojin | 82 +++++----- .../vs12/gtk4-build-defines.props | 2 +- .../vs12/gtk4-builder-tool.vcxproj | 2 +- win32/vs12/gtk4-builder-tool.vcxproj.filters | 20 +++ .../gtk4-demo-application.vcxproj.filtersin | 0 .../vs12/gtk4-demo-application.vcxprojin | 0 .../vs12/gtk4-demo.vcxproj.filtersin | 0 .../win32 => win32}/vs12/gtk4-demo.vcxprojin | 8 +- .../vs12/gtk4-encode-symbolic-svg.vcxproj | 10 +- .../gtk4-encode-symbolic-svg.vcxproj.filters | 2 +- win32/vs12/gtk4-gen-srcs.props | 100 ++++++++++++ .../vs12/gtk4-icon-browser.vcxproj.filtersin | 0 .../vs12/gtk4-icon-browser.vcxprojin | 8 +- .../win32 => win32}/vs12/gtk4-install.propsin | 14 +- .../win32 => win32}/vs12/gtk4-install.vcxproj | 2 +- .../vs12/gtk4-install.vcxproj.filters | 2 +- .../vs12/gtk4-prebuild.vcxproj | 32 ++-- .../vs12/gtk4-prebuild.vcxproj.filters | 8 +- .../vs12/gtk4-query-settings.vcxproj | 2 +- .../vs12/gtk4-query-settings.vcxproj.filters | 2 +- .../vs12/gtk4-update-icon-cache.vcxproj | 2 +- .../gtk4-update-icon-cache.vcxproj.filters | 20 +++ .../vs12/gtk4-version-paths.props.in | 4 +- {build/win32 => win32}/vs14/Makefile.am | 2 +- 61 files changed, 636 insertions(+), 644 deletions(-) delete mode 100644 build/Makefile-newvs.am delete mode 100644 build/Makefile.am delete mode 100644 build/Makefile.msvcproj delete mode 100755 build/win32/vs12/gsk-4.vcxproj.filtersin delete mode 100644 build/win32/vs12/gtk-4.vcxproj.filtersin delete mode 100644 build/win32/vs12/gtk4-builder-tool.vcxproj.filters delete mode 100644 build/win32/vs12/gtk4-gen-srcs.props delete mode 100644 build/win32/vs12/gtk4-query-settings.vcxproj.filters create mode 100644 win32/Makefile-newvs.am rename {build/win32 => win32}/Makefile.am (93%) rename {build => win32}/Makefile.msvc-introspection (67%) create mode 100644 win32/Makefile.msvcproj rename {build/win32 => win32}/detectenv-msvc.mak (100%) rename {build/win32 => win32}/gen-enums.batin (96%) rename {build/win32 => win32}/gtk-introspection-msvc.mak (100%) rename {build/win32 => win32}/gtkpc.py (100%) rename {build/win32 => win32}/introspection-msvc.mak (98%) rename {build/win32 => win32}/pc_base.py (99%) rename {build/win32 => win32}/replace.py (100%) rename {build/win32 => win32}/vs12/Makefile.am (88%) rename {build/win32 => win32}/vs12/README.txt (100%) rename {build/win32 => win32}/vs12/gdk-4.vcxproj.filtersin (90%) rename {build/win32 => win32}/vs12/gdk-4.vcxprojin (91%) rename {build/win32 => win32}/vs12/gdk4-win32.vcxproj.filtersin (100%) rename {build/win32 => win32}/vs12/gdk4-win32.vcxprojin (92%) create mode 100644 win32/vs12/gsk-4.vcxproj.filtersin rename {build/win32 => win32}/vs12/gsk-4.vcxprojin (84%) mode change 100755 => 100644 rename {build/win32 => win32}/vs12/gtk+-4.sln (100%) create mode 100644 win32/vs12/gtk-4.vcxproj.filtersin rename {build/win32 => win32}/vs12/gtk-4.vcxprojin (85%) rename {build/win32 => win32}/vs12/gtk4-build-defines.props (89%) rename {build/win32 => win32}/vs12/gtk4-builder-tool.vcxproj (99%) create mode 100644 win32/vs12/gtk4-builder-tool.vcxproj.filters rename {build/win32 => win32}/vs12/gtk4-demo-application.vcxproj.filtersin (100%) rename {build/win32 => win32}/vs12/gtk4-demo-application.vcxprojin (100%) rename {build/win32 => win32}/vs12/gtk4-demo.vcxproj.filtersin (100%) rename {build/win32 => win32}/vs12/gtk4-demo.vcxprojin (94%) rename {build/win32 => win32}/vs12/gtk4-encode-symbolic-svg.vcxproj (94%) rename {build/win32 => win32}/vs12/gtk4-encode-symbolic-svg.vcxproj.filters (89%) create mode 100644 win32/vs12/gtk4-gen-srcs.props rename {build/win32 => win32}/vs12/gtk4-icon-browser.vcxproj.filtersin (100%) rename {build/win32 => win32}/vs12/gtk4-icon-browser.vcxprojin (93%) rename {build/win32 => win32}/vs12/gtk4-install.propsin (92%) rename {build/win32 => win32}/vs12/gtk4-install.vcxproj (99%) rename {build/win32 => win32}/vs12/gtk4-install.vcxproj.filters (84%) rename {build/win32 => win32}/vs12/gtk4-prebuild.vcxproj (89%) rename {build/win32 => win32}/vs12/gtk4-prebuild.vcxproj.filters (50%) rename {build/win32 => win32}/vs12/gtk4-query-settings.vcxproj (99%) rename build/win32/vs12/gtk4-update-icon-cache.vcxproj.filters => win32/vs12/gtk4-query-settings.vcxproj.filters (93%) rename {build/win32 => win32}/vs12/gtk4-update-icon-cache.vcxproj (99%) create mode 100644 win32/vs12/gtk4-update-icon-cache.vcxproj.filters rename {build/win32 => win32}/vs12/gtk4-version-paths.props.in (94%) rename {build/win32 => win32}/vs14/Makefile.am (96%) diff --git a/Makefile.am b/Makefile.am index 7ec4919ebc..f88eab49aa 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,7 +2,7 @@ include $(top_srcdir)/Makefile.decl SRC_SUBDIRS = gdk gsk gtk modules demos tests testsuite examples -SUBDIRS = po po-properties $(SRC_SUBDIRS) docs build +SUBDIRS = po po-properties $(SRC_SUBDIRS) docs win32 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} diff --git a/build/Makefile-newvs.am b/build/Makefile-newvs.am deleted file mode 100644 index 9fd89f95dd..0000000000 --- a/build/Makefile-newvs.am +++ /dev/null @@ -1,47 +0,0 @@ -# Centralized autotools file -# Create the Visual Studio 2012/2013/2015 project files -# from the Visual Studio 2010 project files - -# This autotools file, from GLib, can be used in other projects -# that have Visual Studio build support, and is copied into -# $(srcroot)/build/. - -# Author: Fan, Chun-wei -# November 05, 2012 - -# MSVC_BASE_VER: Baseline MSVC 201x version to copy/process project files from (10 for 2010, 11 for 2012, 12 for 2013, 14 for 2015 and so on) -# MSVC_BASE_VER_LONG: Long Version of baseline Visual Studio 201x version (2010, 2012, 2013, 14 and so on) -# MSVC_VER_LONG: Long Version of Visual Studio (2012, 2013, 14 and so on) -# MSVC_VER: Short Version of Visual Studio (11 for 2012, 12 for 2013, 14 for 2015 and so on) -# MSVC_FORMAT_VER: Use 12 for MSVC 2012 through 2015 - -%.sln: - sed 's/11\.00/$(MSVC_FORMAT_VER)\.00/g' < $(top_srcdir)/build/win32/vs$(MSVC_BASE_VER)/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp - sed 's/$(MSVC_BASE_VER_LONG)/$(MSVC_VER_LONG)/g' < $(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@ - rm $(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp - -%.txt: - sed 's/vs$(MSVC_BASE_VER)/vs$(MSVC_VER)/g' < $(top_srcdir)/build/win32/vs$(MSVC_BASE_VER)/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp - sed 's/VS$(MSVC_BASE_VER)/VS$(MSVC_VER)/g' < $(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@ - rm $(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp - -%.vcxproj: - if test -e $(top_srcdir)/build/win32/vs$(MSVC_BASE_VER)/$@; then \ - sed 's/v$(MSVC_BASE_VER)0/v$(MSVC_VER)0/g' < $(top_srcdir)/build/win32/vs$(MSVC_BASE_VER)/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \ - else \ - sed 's/v$(MSVC_BASE_VER)0/v$(MSVC_VER)0/g' < $(top_builddir)/build/win32/vs$(MSVC_BASE_VER)/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \ - fi - -%.props: $(top_builddir)/build/win32/vs$(MSVC_BASE_VER)/Makefile - if test -e $(top_srcdir)/build/win32/vs$(MSVC_BASE_VER)/$@; then \ - sed 's/$(MSVC_BASE_VER)<\/VSVer>/$(MSVC_VER)<\/VSVer>/g' < $(top_srcdir)/build/win32/vs$(MSVC_BASE_VER)/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \ - else \ - sed 's/$(MSVC_BASE_VER)<\/VSVer>/$(MSVC_VER)<\/VSVer>/g' < $(top_builddir)/build/win32/vs$(MSVC_BASE_VER)/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \ - fi - -%.vcxproj.filters: - if test -e $(top_srcdir)/build/win32/vs$(MSVC_BASE_VER)/$@; then \ - cp $(top_srcdir)/build/win32/vs$(MSVC_BASE_VER)/$@ $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \ - else \ - cp $(top_builddir)/build/win32/vs$(MSVC_BASE_VER)/$@ $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \ - fi diff --git a/build/Makefile.am b/build/Makefile.am deleted file mode 100644 index b243d647e9..0000000000 --- a/build/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ -include $(top_srcdir)/Makefile.decl - -SUBDIRS = win32 - --include $(top_srcdir)/git.mk diff --git a/build/Makefile.msvcproj b/build/Makefile.msvcproj deleted file mode 100644 index a4e93a5d04..0000000000 --- a/build/Makefile.msvcproj +++ /dev/null @@ -1,154 +0,0 @@ -# Author: Fan, Chun-wei -# Common Autotools file used to generate Visual Studio 2008+ -# Projects from their templates - -# This autotools file, from GLib, can be used in other projects -# that have Visual Studio build support, and is copied into -# $(srcroot)/build/. - -# * Input variables: -# -# MSVCPROJS - List of Projects that should be generated -# -# * Simple tutorial -# -# Add this to Makefile.am where your library/program is built: -# include $(top_srcdir)/build/Makefile.msvcproj -# MSVCPROJS = YourProject (can be multiple projects in a single srcdir) -# YourProject_FILES = $(libyourlib_1_0_SOURCES) -# YourProject_EXCLUDES = ... # list of sources to exclude, separated by '|', wildcards allowed; use random unsed value if none -# (the following 3 lines if headers need to be installed) -# YourProject_HEADERS_DIR = $(libyourlibincludedir) -# YourProject_HEADERS_INST = $(libyourlib_1_0_HEADERS) -# YourProject_HEADERS_EXCLUDES = ... # -# -# dist-hook: \ # (or add to it if it is already there, note the vs9 items will also call the vs10 items in the process) -# $(top_builddir)/build/win32/vs9/YourProject.vcproj \ -# $(top_builddir)/build/win32/vs9/YourProject.headers # if headers need to be installed -# -# --or, if Visual Studio 2013 or later is required-- -# dist-hook: \ # (or add to it if it is already there, this does -not- call other vs items in the process) -# $(top_builddir)/build/win32/vs12/YourProject.vcxproj \ -# $(top_builddir)/build/win32/vs12/YourProject.vs12.headers # if headers need to be installed - -# Private functions - -## Transform the MSVC project filename (no filename extensions) to something which can reference through a variable -## without automake/make complaining, eg Gtk-2.0 -> Gtk_2_0 -_proj_name=$(subst /,_,$(subst -,_,$(subst .,_,$(1)))) -_proj_path_raw:=$(subst $(abs_top_srcdir),,$(abs_srcdir)) -_proj_path=$(subst /,\\,$(_proj_path_raw)) -_proj_subdir_int=$(subst \\\\,\\,\\$(_proj_path)\\) -_proj_subdir=$(subst \\.\\,\\,$(_proj_subdir_int)) - -_proj_files_raw=$(subst /,\\,$($(_proj_name)_FILES)) -_proj_files=$(subst $(srcdir)\\,,$(subst $(builddir)\\,,$(subst $(top_builddir)\\$(_proj_path)\\,\\,$(_proj_files_raw)))) -_proj_filters=$($(_proj_name)_EXCLUDES) - -_proj_headers_raw=$(subst /,\\,$($(_proj_name)_HEADERS_INST)) -_proj_headers=$(subst $(srcdir)\\,,$(subst $(builddir)\\,,$(subst $(top_builddir)\\$(_proj_path)\\,\\,$(_proj_headers_raw)))) -_proj_headers_excludes=$($(_proj_name)_HEADERS_EXCLUDES) - -_headers_dest_posix=$(subst $(includedir),,$($(_proj_name)_HEADERS_DIR)) -_headers_destdir=$(subst /,\\,$(_headers_dest_posix)) - -# -# Creates Visual Studio 2008/2010 projects from items passed in from autotools files -# $(1) - Base Name of the MSVC project files (outputs) -# - -define msvcproj-builder - -$(top_builddir)/build/win32/vs10/$(1).vcxproj: $(top_builddir)/build/win32/vs9/$(1).vcproj -$(top_builddir)/build/win32/vs10/$(1).vcxproj.filters: $(top_builddir)/build/win32/vs9/$(1).vcproj -$(1).sourcefiles: $(top_builddir)/build/win32/vs9/$(1).vcproj -$(1).vs10.sourcefiles: $(top_builddir)/build/win32/vs9/$(1).vcproj -$(1).vs10.sourcefiles.filters: $(top_builddir)/build/win32/vs9/$(1).vcproj - -$(top_builddir)/build/win32/vs9/$(1).vcproj: Makefile - -$(RM) $(top_builddir)/build/win32/vs9/$(1).vcproj - -$(RM) $(top_builddir)/build/win32/vs10/$(1).vcxproj - -$(RM) $(top_builddir)/build/win32/vs10/$(1).vcxproj.filters - -$(RM) $(top_builddir)/build/win32/vs11/$(1).vcxproj - -$(RM) $(top_builddir)/build/win32/vs11/$(1).vcxproj.filters - -$(RM) $(top_builddir)/build/win32/vs12/$(1).vcxproj - -$(RM) $(top_builddir)/build/win32/vs12/$(1).vcxproj.filters - -$(RM) $(top_builddir)/build/win32/vs14/$(1).vcxproj - -$(RM) $(top_builddir)/build/win32/vs14/$(1).vcxproj.filters - - - for F in $(_proj_files); do \ - case $$$$F in \ - $(_proj_filters)) \ - ;; \ - *.c|*.cpp|*.cc|*.cxx) \ - echo ' ' >>$(1).sourcefiles && \ - echo ' ' >>$(1).vs10.sourcefiles && \ - echo ' Source Files' >>$(1).vs10.sourcefiles.filters \ - ;; \ - esac; \ - done - - - $(CPP) -P - <$(top_srcdir)/build/win32/vs9/$(1).vcprojin >$(top_builddir)/build/win32/vs9/$(1).vcproj - $(CPP) -P - <$(top_srcdir)/build/win32/vs10/$(1).vcxprojin >$(top_builddir)/build/win32/vs10/$(1).vcxproj - $(CPP) -P - <$(top_srcdir)/build/win32/vs10/$(1).vcxproj.filtersin >$(top_builddir)/build/win32/vs10/$(1).vcxproj.filters - $(RM) $(1).sourcefiles - $(RM) $(1).vs10.sourcefiles - $(RM) $(1).vs10.sourcefiles.filters - -$(top_builddir)/build/win32/vs10/$(1).vs10.headers: $(top_builddir)/build/win32/vs9/$(1).headers - -$(top_builddir)/build/win32/vs9/$(1).headers: Makefile - -$(RM) $(top_builddir)/build/win32/vs9/$(1).headers - -$(RM) $(top_builddir)/build/win32/vs10/$(1).vs10.headers - - for F in $(_proj_headers); do \ - case $$$$F in \ - $(_proj_headers_excludes)) \ - ;; \ - *.h|*.hpp|*.hh|*.hxx) \ - echo 'copy ..\..\..'$(_proj_subdir)$$$$F' $$$$(CopyDir)\include'$(_headers_destdir)'\'$$$$F' ' >>$(top_builddir)/build/win32/vs9/$(1).headers && \ - echo 'copy ..\..\..'$(_proj_subdir)$$$$F' $$$$(CopyDir)\include'$(_headers_destdir)'\'$$$$F >>$(top_builddir)/build/win32/vs10/$(1).vs10.headers \ - ;; \ - esac; \ - done - -$(top_builddir)/build/win32/vs12/$(1).vcxproj.filters: $(top_builddir)/build/win32/vs12/$(1).vcxproj - -$(top_builddir)/build/win32/vs12/$(1).vcxproj: Makefile - -$(RM) $(top_builddir)/build/win32/vs14/$(1).vcxproj - -$(RM) $(top_builddir)/build/win32/vs14/$(1).vcxproj.filters - - for F in $(_proj_files); do \ - case $$$$F in \ - $(_proj_filters)) \ - ;; \ - *.c|*.cpp|*.cc|*.cxx) \ - echo ' ' >>$(1).vs12.sourcefiles && \ - echo ' Source Files' >>$(1).vs12.sourcefiles.filters \ - ;; \ - esac; \ - done - - $(CPP) -P - <$(top_srcdir)/build/win32/vs12/$(1).vcxprojin >$(top_builddir)/build/win32/vs12/$(1).vcxproj - $(CPP) -P - <$(top_srcdir)/build/win32/vs12/$(1).vcxproj.filtersin >$(top_builddir)/build/win32/vs12/$(1).vcxproj.filters - $(RM) $(1).vs12.sourcefiles - $(RM) $(1).vs12.sourcefiles.filters - -$(top_builddir)/build/win32/vs12/$(1).vs12.headers: Makefile - -$(RM) $(top_builddir)/build/win32/vs12/$(1).vs12.headers - - for F in $(_proj_headers); do \ - case $$$$F in \ - $(_proj_headers_excludes)) \ - ;; \ - *.h|*.hpp|*.hh|*.hxx) \ - echo 'copy ..\..\..'$(_proj_subdir)$$$$F' $$$$(CopyDir)\include'$(_headers_destdir)'\'$$$$F >>$(top_builddir)/build/win32/vs12/$(1).vs12.headers \ - ;; \ - esac; \ - done - -endef - -$(foreach proj,$(MSVCPROJS),$(eval $(call msvcproj-builder,$(proj)))) diff --git a/build/win32/vs12/gsk-4.vcxproj.filtersin b/build/win32/vs12/gsk-4.vcxproj.filtersin deleted file mode 100755 index 6bd8d0af24..0000000000 --- a/build/win32/vs12/gsk-4.vcxproj.filtersin +++ /dev/null @@ -1,39 +0,0 @@ - - - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - - Resource Files - Resource Files - - -#include "gsk-4.vs12.sourcefiles.filters" - Source Files - Source Files - Source Files - Source Files - Source Files - Source Files - Source Files - Source Files - Source Files - Source Files - Source Files - Source Files - Source Files - Source Files - Source Files - - diff --git a/build/win32/vs12/gtk-4.vcxproj.filtersin b/build/win32/vs12/gtk-4.vcxproj.filtersin deleted file mode 100644 index 1b541bba06..0000000000 --- a/build/win32/vs12/gtk-4.vcxproj.filtersin +++ /dev/null @@ -1,46 +0,0 @@ - - - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - - Resource Files - - - Resource Files - Resource Files - Resource Files - - -#include "gtk-4.vs12.sourcefiles.filters" - Source Files - Source Files - Source Files - Source Files - Source Files - Source Files - Source Files - Source Files - Source Files - Source Files - Source Files - Source Files - Source Files - Source Files - Source Files - - - Resource Files - - diff --git a/build/win32/vs12/gtk4-builder-tool.vcxproj.filters b/build/win32/vs12/gtk4-builder-tool.vcxproj.filters deleted file mode 100644 index 8b19c8b0f3..0000000000 --- a/build/win32/vs12/gtk4-builder-tool.vcxproj.filters +++ /dev/null @@ -1,20 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - - Sources - - diff --git a/build/win32/vs12/gtk4-gen-srcs.props b/build/win32/vs12/gtk4-gen-srcs.props deleted file mode 100644 index 73728f3394..0000000000 --- a/build/win32/vs12/gtk4-gen-srcs.props +++ /dev/null @@ -1,100 +0,0 @@ - - - - - - - copy ..\..\..\config.h.win32 ..\..\..\config.h - -if exist ..\..\..\MSVC_$(Configuration) goto DONE_GDKCONFIG_H - -if exist ..\..\..\gdk\gdkconfig.h del ..\..\..\gdk\gdkconfig.h -if exist ..\..\..\GDK_VULKAN_BUILD del ..\..\..\GDK_VULKAN_BUILD -if exist ..\..\..\MSVC_$(Configuration)_Vulkan del ..\..\..\MSVC_$(Configuration)_Vulkan -if exist $(Configuration)\$(Platform)\bin\$(GtkDllPrefix)gdk$(GtkDllSuffix).dll del $(Configuration)\$(Platform)\bin\$(GtkDllPrefix)gdk$(GtkDllSuffix).dll -if exist $(Configuration)\$(Platform)\bin\gdk-$(ApiVersion).lib del $(Configuration)\$(Platform)\bin\gdk-$(ApiVersion).lib -if "$(Configuration)" == "Release" del ..\..\..\MSVC_Debug -if "$(Configuration)" == "Debug" del ..\..\..\MSVC_Release -copy ..\..\..\gdk\gdkconfig.h.win32 ..\..\..\gdk\gdkconfig.h -copy ..\..\..\gdk\gdkconfig.h.win32 ..\..\..\GDK_WIN32ONLY_BUILD -echo $(Configuration) > ..\..\..\MSVC_$(Configuration) - -:DONE_GDKCONFIG_H - - -if exist ..\..\..\MSVC_$(Configuration)_Vulkan goto DONE_GDKCONFIG_H - -if exist ..\..\..\gdk\gdkconfig.h del ..\..\..\gdk\gdkconfig.h -if exist ..\..\..\GDK_WIN32ONLY_BUILD del ..\..\..\GDK_WIN32ONLY_BUILD -if exist ..\..\..\MSVC_Release del ..\..\..\MSVC_Release -if exist ..\..\..\MSVC_Debug del ..\..\..\MSVC_Debug - -if "$(Configuration)" == "Release_Vulkan" del ..\..\..\MSVC_Debug_Vulkan -if "$(Configuration)" == "Debug_Vulkan" del ..\..\..\MSVC_Release_Vulkan - -copy ..\..\..\gdk\gdkconfig.h.win32_vulkan ..\..\..\gdk\gdkconfig.h -copy ..\..\..\gdk\gdkconfig.h.win32_vulkan ..\..\..\GDK_VULKAN_BUILD -echo $(Configuration) > ..\..\..\MSVC_$(Configuration)_Vulkan - -:DONE_GDKCONFIG_H - - $(GlibEtcInstallRoot)\bin\gdbus-codegen --interface-prefix org.Gtk. --c-namespace _Gtk --generate-c-code gtkdbusgenerated ./gtkdbusinterfaces.xml - cd ..\..\..\gtk & $(PythonPath)\python $(GDbusCodeGenCmd) & cd $(SolutionDir) - cd ..\..\..\gtk & $(PythonPathX64)\python $(GDbusCodeGenCmd) & cd $(SolutionDir) - copy ..\..\..\gtk\gtk-win32.rc.body ..\..\..\gtk\gtk-win32.rc - $(PythonPath)\python ..\replace.py --action=replace-var --input=..\..\..\gtk\libgtk4.manifest.in --output=..\..\..\gtk\libgtk4.manifest --var=EXE_MANIFEST_ARCHITECTURE --outstring=* - copy ..\..\..\demos\gtk-demo\demos.h.win32 ..\..\..\demos\gtk-demo\demos.h - (cd ..) & (call gen-enums.bat $(GlibEtcInstallRoot)) & (cd $(SolutionDir)) - -echo ^<?xml version='1.0' encoding='UTF-8'?^> > ..\..\..\gsk\gsk.gresource.xml -echo ^<gresources^> >> ..\..\..\gsk\gsk.gresource.xml -echo ^<gresource prefix='/org/gtk/libgsk'^> >> ..\..\..\gsk\gsk.gresource.xml -for /f %%f in ('dir /b ..\..\..\gsk\resources\glsl\*') do echo ^<file alias='glsl/%%f'^>resources/glsl/%%f^</file^> >> ..\..\..\gsk\gsk.gresource.xml -for /f %%f in ('dir /b ..\..\..\gsk\resources\vulkan\*.spv') do echo ^<file alias='vulkan/%%f'^>resources/vulkan/%%f^</file^> >> ..\..\..\gsk\gsk.gresource.xml -for /f %%f in ('dir /b ..\..\..\gsk\resources\vulkan\*.glsl') do echo ^<file alias='vulkan/%%f'^>resources/vulkan/%%f^</file^> >> ..\..\..\gsk\gsk.gresource.xml -echo ^</gresource^> >> ..\..\..\gsk\gsk.gresource.xml -echo ^</gresources^> >> ..\..\..\gsk\gsk.gresource.xml - -$(GlibEtcInstallRoot)\bin\glib-compile-resources.exe --sourcedir=..\..\..\gsk --c-name _gsk --generate-header --manual-register --target=..\..\..\gsk\gskresources.h ..\..\..\gsk\gsk.gresource.xml -$(GlibEtcInstallRoot)\bin\glib-compile-resources.exe --sourcedir=..\..\..\gsk --c-name _gsk --generate-source --manual-register --target=..\..\..\gsk\gskresources.c ..\..\..\gsk\gsk.gresource.xml - - - - <_PropertySheetDisplayName>gtk4gensrcsprops - - - - $(GenConfigH) - - - $(GenGdkConfigHWin32) - - - $(GenGdkConfigHVulkan) - - - $(GDbusCodeGenCmd) - - - $(GenerateGtkDbusBuiltSources) - - - $(GenerateGtkDbusBuiltSourcesX64) - - - $(CopyGtkWin32RC) - - - $(GenerateGtkWin32Manifest) - - - $(CopyDemosH) - - - $(GenGSKEnumSrcs) - - - $(GenGSKRsrcSrcs) - - - diff --git a/build/win32/vs12/gtk4-query-settings.vcxproj.filters b/build/win32/vs12/gtk4-query-settings.vcxproj.filters deleted file mode 100644 index 42804c1aee..0000000000 --- a/build/win32/vs12/gtk4-query-settings.vcxproj.filters +++ /dev/null @@ -1,20 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - - Sources - - diff --git a/configure.ac b/configure.ac index b70a89a822..7bbe7efc8d 100644 --- a/configure.ac +++ b/configure.ac @@ -2021,11 +2021,10 @@ docs/reference/gtk/Makefile docs/reference/gtk/gtk4.types docs/reference/gtk/version.xml docs/tools/Makefile -build/Makefile -build/win32/Makefile -build/win32/vs12/Makefile -build/win32/vs12/gtk4-version-paths.props -build/win32/vs14/Makefile +win32/Makefile +win32/vs12/Makefile +win32/vs12/gtk4-version-paths.props +win32/vs14/Makefile gdk/Makefile gdk/broadway/Makefile gdk/x11/Makefile diff --git a/demos/gtk-demo/Makefile.am b/demos/gtk-demo/Makefile.am index 564c6de232..b3bcd7de69 100644 --- a/demos/gtk-demo/Makefile.am +++ b/demos/gtk-demo/Makefile.am @@ -194,11 +194,11 @@ gtk4_demo_EXCLUDES = font_features.c|pagesetup.c gtk4_demo_application_FILES = $(gtk4_demo_application_SOURCES) gtk4_demo_application_EXCLUDES = dummy -include $(top_srcdir)/build/Makefile.msvcproj +include $(top_srcdir)/win32/Makefile.msvcproj dist-hook: \ - $(top_builddir)/build/win32/vs12/gtk4-demo.vcxproj \ - $(top_builddir)/build/win32/vs12/gtk4-demo-application.vcxproj + $(top_builddir)/win32/vs12/gtk4-demo.vcxproj \ + $(top_builddir)/win32/vs12/gtk4-demo-application.vcxproj DISTCLEANFILES = demos.h demos.h.win32 diff --git a/demos/icon-browser/Makefile.am b/demos/icon-browser/Makefile.am index 03ba276913..039b952502 100644 --- a/demos/icon-browser/Makefile.am +++ b/demos/icon-browser/Makefile.am @@ -40,8 +40,8 @@ MSVCPROJS = gtk4-icon-browser gtk4_icon_browser_FILES = $(gtk4_icon_browser_SOURCES) gtk4_icon_browser_EXCLUDES = dummy -include $(top_srcdir)/build/Makefile.msvcproj +include $(top_srcdir)/win32/Makefile.msvcproj -dist-hook: $(top_builddir)/build/win32/vs12/gtk4-icon-browser.vcxproj +dist-hook: $(top_builddir)/win32/vs12/gtk4-icon-browser.vcxproj -include $(top_srcdir)/git.mk diff --git a/gdk/Makefile.am b/gdk/Makefile.am index 064fe39fb2..162016a114 100644 --- a/gdk/Makefile.am +++ b/gdk/Makefile.am @@ -476,7 +476,7 @@ gdk_4_HEADERS_INST = \ gdk_4_HEADERS_EXCLUDES = dummy -include $(top_srcdir)/build/Makefile.msvcproj +include $(top_srcdir)/win32/Makefile.msvcproj if HAVE_INTROSPECTION # Introspection Items for MSVC @@ -487,10 +487,10 @@ BASE_MSVC_GIR_CFLAGS = \ -I../.. -I../../gdk -I.../../gdk/win32 INTROSPECTION_INTERMEDIATE_ITEMS = \ - $(top_builddir)/build/win32/Gdk-4.0.gir.msvc.introspect \ - $(top_builddir)/build/win32/Gdk_4_0_gir_list \ - $(top_builddir)/build/win32/GdkWin32-4.0.gir.msvc.introspect \ - $(top_builddir)/build/win32/GdkWin32_4_0_gir_list + $(top_builddir)/win32/Gdk-4.0.gir.msvc.introspect \ + $(top_builddir)/win32/Gdk_4_0_gir_list \ + $(top_builddir)/win32/GdkWin32-4.0.gir.msvc.introspect \ + $(top_builddir)/win32/GdkWin32_4_0_gir_list Gdk_4_0_gir_MSVC_FILES = $(introspection_files) Gdk_4_0_gir_MSVC_EXPORT_PACKAGES = $(Gdk_noinst_4_0_gir_EXPORT_PACKAGES) @@ -508,15 +508,15 @@ GdkWin32_4_0_gir_MSVC_SCANNERFLAGS = \ --c-include="gdk/gdkwin32.h" \ --include-uninstalled=./Gdk-4.0.gir -include $(top_srcdir)/build/Makefile.msvc-introspection +include $(top_srcdir)/win32/Makefile.msvc-introspection else INTROSPECTION_INTERMEDIATE_ITEMS = endif dist-hook: \ - $(top_builddir)/build/win32/vs12/gdk-4.vcxproj \ - $(top_builddir)/build/win32/vs12/gdk-4.vs12.headers \ + $(top_builddir)/win32/vs12/gdk-4.vcxproj \ + $(top_builddir)/win32/vs12/gdk-4.vs12.headers \ $(INTROSPECTION_INTERMEDIATE_ITEMS) DISTCLEANFILES = gdkconfig.h stamp-gc-h diff --git a/gdk/win32/Makefile.am b/gdk/win32/Makefile.am index 991dc9e3bc..596f183892 100644 --- a/gdk/win32/Makefile.am +++ b/gdk/win32/Makefile.am @@ -99,10 +99,10 @@ gdk4_win32_HEADERS_INST = $(libgdkwin32include_HEADERS) gdk4_win32_HEADERS_EXCLUDES = dummy -include $(top_srcdir)/build/Makefile.msvcproj +include $(top_srcdir)/win32/Makefile.msvcproj dist-hook: \ - $(top_builddir)/build/win32/vs12/gdk4-win32.vcxproj \ - $(top_builddir)/build/win32/vs12/gdk4-win32.vs12.headers + $(top_builddir)/win32/vs12/gdk4-win32.vcxproj \ + $(top_builddir)/win32/vs12/gdk4-win32.vs12.headers -include $(top_srcdir)/git.mk diff --git a/gsk/Makefile.am b/gsk/Makefile.am index 2a309ef575..e176dd25c6 100644 --- a/gsk/Makefile.am +++ b/gsk/Makefile.am @@ -256,14 +256,14 @@ gsk_4_HEADERS_DIR = $(gskincludedir) gsk_4_HEADERS_INST = $(gskinclude_HEADERS) gsk_4_HEADERS_EXCLUDES = dummy -include $(top_srcdir)/build/Makefile.msvcproj +include $(top_srcdir)/win32/Makefile.msvcproj -$(top_builddir)/build/win32/gsk.enum.headers: Makefile $(gsk_public_source_h) - -$(RM) $(top_builddir)/build/win32/gsk.enum.headers +$(top_builddir)/win32/gsk.enum.headers: Makefile $(gsk_public_source_h) + -$(RM) $(top_builddir)/win32/gsk.enum.headers for F in $(gsk_public_source_h); do \ case $$F in \ *.h) \ - echo $$F' ^'>>$(top_builddir)/build/win32/gsk.enum.headers \ + echo $$F' ^'>>$(top_builddir)/win32/gsk.enum.headers \ ;; \ esac \ done @@ -277,9 +277,9 @@ BASE_MSVC_GIR_CFLAGS = \ -I../.. -I../../gdk -I.../../gsk INTROSPECTION_INTERMEDIATE_ITEMS = \ - $(top_builddir)/build/win32/Gsk-4.0.gir.msvc.introspect \ - $(top_builddir)/build/win32/Gsk_4_0_gir_list \ - $(top_builddir)/build/win32/gsk.enum.headers + $(top_builddir)/win32/Gsk-4.0.gir.msvc.introspect \ + $(top_builddir)/win32/Gsk_4_0_gir_list \ + $(top_builddir)/win32/gsk.enum.headers Gsk_4_0_gir_MSVC_FILES = $(introspection_files) Gsk_4_0_gir_MSVC_EXPORT_PACKAGES = $(Gsk_noinst_4_0_gir_EXPORT_PACKAGES) @@ -290,16 +290,16 @@ Gsk_4_0_gir_MSVC_SCANNERFLAGS = \ --add-include-path=. \ --include-uninstalled=../gdk/Gdk-4.0.gir -include $(top_srcdir)/build/Makefile.msvc-introspection +include $(top_srcdir)/win32/Makefile.msvc-introspection else INTROSPECTION_INTERMEDIATE_ITEMS = endif dist-hook: \ - $(top_builddir)/build/win32/vs12/gsk-4.vcxproj \ - $(top_builddir)/build/win32/vs12/gsk-4.vs12.headers \ - $(top_builddir)/build/win32/gsk.enum.headers \ + $(top_builddir)/win32/vs12/gsk-4.vcxproj \ + $(top_builddir)/win32/vs12/gsk-4.vs12.headers \ + $(top_builddir)/win32/gsk.enum.headers \ $(INTROSPECTION_INTERMEDIATE_ITEMS) -include $(top_srcdir)/git.mk diff --git a/gtk/Makefile.am b/gtk/Makefile.am index 3a672c0d8c..57ceb768bc 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -1416,7 +1416,7 @@ gtk_4_HEADERS_INST = \ gtk_4_HEADERS_EXCLUDES = dummy -include $(top_srcdir)/build/Makefile.msvcproj +include $(top_srcdir)/win32/Makefile.msvcproj if HAVE_INTROSPECTION # Introspection Items for MSVC @@ -1445,8 +1445,8 @@ GTK_MSVC_GIR_CFLAGS = \ -I../.. -I../../gtk -I../../gdk INTROSPECTION_INTERMEDIATE_ITEMS = \ - $(top_builddir)/build/win32/Gtk-4.0.gir.msvc.introspect \ - $(top_builddir)/build/win32/Gtk_4_0_gir_list + $(top_builddir)/win32/Gtk-4.0.gir.msvc.introspect \ + $(top_builddir)/win32/Gtk_4_0_gir_list Gtk_4_0_gir_MSVC_FILES = \ $(introspected_pub_headers) \ @@ -1461,7 +1461,7 @@ Gtk_4_0_gir_MSVC_LIBS = gtk-4 Gtk_4_0_gir_MSVC_CFLAGS = $(GTK_MSVC_GIR_CFLAGS) Gtk_4_0_gir_MSVC_SCANNERFLAGS = --warn-all --add-include-path=. --include-uninstalled=./Gdk-4.0.gir --include-uninstalled=./Gsk-4.0.gir -include $(top_srcdir)/build/Makefile.msvc-introspection +include $(top_srcdir)/win32/Makefile.msvc-introspection else INTROSPECTION_INTERMEDIATE_ITEMS = @@ -1469,8 +1469,8 @@ INTROSPECTION_INTERMEDIATE_ITEMS = endif dist-hook: \ - $(top_builddir)/build/win32/vs12/gtk-4.vcxproj \ - $(top_builddir)/build/win32/vs12/gtk-4.vs12.headers \ + $(top_builddir)/win32/vs12/gtk-4.vcxproj \ + $(top_builddir)/win32/vs12/gtk-4.vs12.headers \ $(INTROSPECTION_INTERMEDIATE_ITEMS) # Install a RC file for the default GTK+ theme, and key themes diff --git a/win32/Makefile-newvs.am b/win32/Makefile-newvs.am new file mode 100644 index 0000000000..ecdf3b5568 --- /dev/null +++ b/win32/Makefile-newvs.am @@ -0,0 +1,46 @@ +# Centralized autotools file +# Create the Visual Studio 2012/2013/2015 project files +# from the Visual Studio 2010 project files + +# This autotools file, from GLib, can be used in other projects +# that have Visual Studio build support. + +# Author: Fan, Chun-wei +# November 05, 2012 + +# MSVC_BASE_VER: Baseline MSVC 201x version to copy/process project files from (10 for 2010, 11 for 2012, 12 for 2013, 14 for 2015 and so on) +# MSVC_BASE_VER_LONG: Long Version of baseline Visual Studio 201x version (2010, 2012, 2013, 14 and so on) +# MSVC_VER_LONG: Long Version of Visual Studio (2012, 2013, 14 and so on) +# MSVC_VER: Short Version of Visual Studio (11 for 2012, 12 for 2013, 14 for 2015 and so on) +# MSVC_FORMAT_VER: Use 12 for MSVC 2012 through 2015 + +%.sln: + sed 's/11\.00/$(MSVC_FORMAT_VER)\.00/g' < $(top_srcdir)/win32/vs$(MSVC_BASE_VER)/$@ > $(top_builddir)/win32/vs$(MSVC_VER)/$@.tmp + sed 's/$(MSVC_BASE_VER_LONG)/$(MSVC_VER_LONG)/g' < $(top_builddir)/win32/vs$(MSVC_VER)/$@.tmp > $(top_builddir)/win32/vs$(MSVC_VER)/$@ + rm $(top_builddir)/win32/vs$(MSVC_VER)/$@.tmp + +%.txt: + sed 's/vs$(MSVC_BASE_VER)/vs$(MSVC_VER)/g' < $(top_srcdir)/win32/vs$(MSVC_BASE_VER)/$@ > $(top_builddir)/win32/vs$(MSVC_VER)/$@.tmp + sed 's/VS$(MSVC_BASE_VER)/VS$(MSVC_VER)/g' < $(top_builddir)/win32/vs$(MSVC_VER)/$@.tmp > $(top_builddir)/win32/vs$(MSVC_VER)/$@ + rm $(top_builddir)/win32/vs$(MSVC_VER)/$@.tmp + +%.vcxproj: + if test -e $(top_srcdir)/win32/vs$(MSVC_BASE_VER)/$@; then \ + sed 's/v$(MSVC_BASE_VER)0/v$(MSVC_VER)0/g' < $(top_srcdir)/win32/vs$(MSVC_BASE_VER)/$@ > $(top_builddir)/win32/vs$(MSVC_VER)/$@; \ + else \ + sed 's/v$(MSVC_BASE_VER)0/v$(MSVC_VER)0/g' < $(top_builddir)/win32/vs$(MSVC_BASE_VER)/$@ > $(top_builddir)/win32/vs$(MSVC_VER)/$@; \ + fi + +%.props: $(top_builddir)/win32/vs$(MSVC_BASE_VER)/Makefile + if test -e $(top_srcdir)/win32/vs$(MSVC_BASE_VER)/$@; then \ + sed 's/$(MSVC_BASE_VER)<\/VSVer>/$(MSVC_VER)<\/VSVer>/g' < $(top_srcdir)/win32/vs$(MSVC_BASE_VER)/$@ > $(top_builddir)/win32/vs$(MSVC_VER)/$@; \ + else \ + sed 's/$(MSVC_BASE_VER)<\/VSVer>/$(MSVC_VER)<\/VSVer>/g' < $(top_builddir)/win32/vs$(MSVC_BASE_VER)/$@ > $(top_builddir)/win32/vs$(MSVC_VER)/$@; \ + fi + +%.vcxproj.filters: + if test -e $(top_srcdir)/win32/vs$(MSVC_BASE_VER)/$@; then \ + cp $(top_srcdir)/win32/vs$(MSVC_BASE_VER)/$@ $(top_builddir)/win32/vs$(MSVC_VER)/$@; \ + else \ + cp $(top_builddir)/win32/vs$(MSVC_BASE_VER)/$@ $(top_builddir)/win32/vs$(MSVC_VER)/$@; \ + fi diff --git a/build/win32/Makefile.am b/win32/Makefile.am similarity index 93% rename from build/win32/Makefile.am rename to win32/Makefile.am index d29abdae1d..c1d0750b6c 100644 --- a/build/win32/Makefile.am +++ b/win32/Makefile.am @@ -20,7 +20,7 @@ introspection.body.mak: $(MSVC_INTROSPECTION_INTERMEDIATE_FILES) -$(RM) introspection.body.mak for F in `ls *.msvc.introspect`; do \ case $$F in \ - *) cat $(top_builddir)/build/win32/$$F >>introspection.body.mak \ + *) cat $(top_builddir)/win32/$$F >>introspection.body.mak \ ;; \ esac; \ done diff --git a/build/Makefile.msvc-introspection b/win32/Makefile.msvc-introspection similarity index 67% rename from build/Makefile.msvc-introspection rename to win32/Makefile.msvc-introspection index 6c9096436f..28e8b50bcc 100644 --- a/build/Makefile.msvc-introspection +++ b/win32/Makefile.msvc-introspection @@ -2,7 +2,7 @@ # Common autotools file for constructing the g-ir-scanner and # g-ir-compiler command lines for Visual Studio builds. -# This is copied from $(srcroot)/build from the gobject-introspection +# This is copied from $(srcroot)/win32 from the gobject-introspection # project, which may be included in projects that support both # Visual Studio builds and introspection. @@ -18,7 +18,7 @@ # is required unless --headers-only is specified in # YourLib_1_0_gir__MSVC_SCANNERFLAGS) # -# include $(top_srcdir)/build/Makefile.msvc-introspection +# include >$(top_builddir)/build/win32/$(_gir_name)_list \ + echo '..\..'$(_gir_source_subdir_msvc)$$$$F >>$(top_builddir)/win32/$(_gir_name)_list \ ;; \ esac; \ done -$(top_builddir)/build/win32/$(1).msvc.introspect: - -$(RM) $(top_builddir)/build/win32/$(1).msvc.introspect +$(top_builddir)/win32/$(1).msvc.introspect: + -$(RM) $(top_builddir)/win32/$(1).msvc.introspect # Assemble the Command to Run g-ir-scanner - echo $(1)': '$(_gir_name)'_list '$($(_gir_name)_MSVC_GIR_DEPS)>>$(top_builddir)/build/win32/$(1).msvc.introspect - echo ' @-echo Generating $$$$@...'>>$(top_builddir)/build/win32/$(1).msvc.introspect - echo ' $$$$(PYTHON) $$$$(G_IR_SCANNER) \'>>$(top_builddir)/build/win32/$(1).msvc.introspect - echo ' --verbose -no-libtool \'>>$(top_builddir)/build/win32/$(1).msvc.introspect - echo ' --namespace='$(_gir_namespace_msvc)' \'>>$(top_builddir)/build/win32/$(1).msvc.introspect - echo ' --nsversion='$(_gir_version_msvc)' \'>>$(top_builddir)/build/win32/$(1).msvc.introspect - echo ' '$(_gir_packages_msvc)' \'>>$(top_builddir)/build/win32/$(1).msvc.introspect - echo ' '$(_gir_libraries_msvc)' \'>>$(top_builddir)/build/win32/$(1).msvc.introspect - echo ' '$(_gir_program_msvc)' \'>>$(top_builddir)/build/win32/$(1).msvc.introspect - echo ' --add-include-path=$$$$(G_IR_INCLUDEDIR) \'>>$(top_builddir)/build/win32/$(1).msvc.introspect - echo ' '$(_gir_includes_msvc)' \'>>$(top_builddir)/build/win32/$(1).msvc.introspect - echo ' '$(_gir_export_packages_msvc)' \'>>$(top_builddir)/build/win32/$(1).msvc.introspect - echo ' --cflags-begin \'>>$(top_builddir)/build/win32/$(1).msvc.introspect - echo ' '$($(_gir_name)_MSVC_CFLAGS)' \'>>$(top_builddir)/build/win32/$(1).msvc.introspect - echo ' --cflags-end \'>>$(top_builddir)/build/win32/$(1).msvc.introspect - echo ' '$($(_gir_name)_MSVC_SCANNERFLAGS)' \'>>$(top_builddir)/build/win32/$(1).msvc.introspect - echo ' --filelist='$(_gir_name)'_list \'>>$(top_builddir)/build/win32/$(1).msvc.introspect - echo ' -o $$$$@'>>$(top_builddir)/build/win32/$(1).msvc.introspect - echo '' >>$(top_builddir)/build/win32/$(1).msvc.introspect + echo $(1)': '$(_gir_name)'_list '$($(_gir_name)_MSVC_GIR_DEPS)>>$(top_builddir)/win32/$(1).msvc.introspect + echo ' @-echo Generating $$$$@...'>>$(top_builddir)/win32/$(1).msvc.introspect + echo ' $$$$(PYTHON) $$$$(G_IR_SCANNER) \'>>$(top_builddir)/win32/$(1).msvc.introspect + echo ' --verbose -no-libtool \'>>$(top_builddir)/win32/$(1).msvc.introspect + echo ' --namespace='$(_gir_namespace_msvc)' \'>>$(top_builddir)/win32/$(1).msvc.introspect + echo ' --nsversion='$(_gir_version_msvc)' \'>>$(top_builddir)/win32/$(1).msvc.introspect + echo ' '$(_gir_packages_msvc)' \'>>$(top_builddir)/win32/$(1).msvc.introspect + echo ' '$(_gir_libraries_msvc)' \'>>$(top_builddir)/win32/$(1).msvc.introspect + echo ' '$(_gir_program_msvc)' \'>>$(top_builddir)/win32/$(1).msvc.introspect + echo ' --add-include-path=$$$$(G_IR_INCLUDEDIR) \'>>$(top_builddir)/win32/$(1).msvc.introspect + echo ' '$(_gir_includes_msvc)' \'>>$(top_builddir)/win32/$(1).msvc.introspect + echo ' '$(_gir_export_packages_msvc)' \'>>$(top_builddir)/win32/$(1).msvc.introspect + echo ' --cflags-begin \'>>$(top_builddir)/win32/$(1).msvc.introspect + echo ' '$($(_gir_name)_MSVC_CFLAGS)' \'>>$(top_builddir)/win32/$(1).msvc.introspect + echo ' --cflags-end \'>>$(top_builddir)/win32/$(1).msvc.introspect + echo ' '$($(_gir_name)_MSVC_SCANNERFLAGS)' \'>>$(top_builddir)/win32/$(1).msvc.introspect + echo ' --filelist='$(_gir_name)'_list \'>>$(top_builddir)/win32/$(1).msvc.introspect + echo ' -o $$$$@'>>$(top_builddir)/win32/$(1).msvc.introspect + echo '' >>$(top_builddir)/win32/$(1).msvc.introspect # Finally Assemble the Command to Compile the generated .gir - echo '$(_typelib_basename_msvc).typelib: '$(_typelib_basename_msvc)'.gir'>>$(top_builddir)/build/win32/$(1).msvc.introspect - echo ' @-echo Compiling $$$$@...'>>$(top_builddir)/build/win32/$(1).msvc.introspect - echo ' $$$$(G_IR_COMPILER) \'>>$(top_builddir)/build/win32/$(1).msvc.introspect - echo ' --includedir=. --debug --verbose \'>>$(top_builddir)/build/win32/$(1).msvc.introspect - echo ' '$(1)' \'>>$(top_builddir)/build/win32/$(1).msvc.introspect - echo ' -o $$$$@'>>$(top_builddir)/build/win32/$(1).msvc.introspect - echo '' >>$(top_builddir)/build/win32/$(1).msvc.introspect + echo '$(_typelib_basename_msvc).typelib: '$(_typelib_basename_msvc)'.gir'>>$(top_builddir)/win32/$(1).msvc.introspect + echo ' @-echo Compiling $$$$@...'>>$(top_builddir)/win32/$(1).msvc.introspect + echo ' $$$$(G_IR_COMPILER) \'>>$(top_builddir)/win32/$(1).msvc.introspect + echo ' --includedir=. --debug --verbose \'>>$(top_builddir)/win32/$(1).msvc.introspect + echo ' '$(1)' \'>>$(top_builddir)/win32/$(1).msvc.introspect + echo ' -o $$$$@'>>$(top_builddir)/win32/$(1).msvc.introspect + echo '' >>$(top_builddir)/win32/$(1).msvc.introspect endef $(foreach gir,$(MSVC_INTROSPECT_GIRS),$(eval $(call gir-nmake-builder,$(gir)))) diff --git a/win32/Makefile.msvcproj b/win32/Makefile.msvcproj new file mode 100644 index 0000000000..2e96e12bcf --- /dev/null +++ b/win32/Makefile.msvcproj @@ -0,0 +1,153 @@ +# Author: Fan, Chun-wei +# Common Autotools file used to generate Visual Studio 2008+ +# Projects from their templates + +# This autotools file, from GLib, can be used in other projects +# that have Visual Studio build support. + +# * Input variables: +# +# MSVCPROJS - List of Projects that should be generated +# +# * Simple tutorial +# +# Add this to Makefile.am where your library/program is built: +# include +# MSVCPROJS = YourProject (can be multiple projects in a single srcdir) +# YourProject_FILES = $(libyourlib_1_0_SOURCES) +# YourProject_EXCLUDES = ... # list of sources to exclude, separated by '|', wildcards allowed; use random unsed value if none +# (the following 3 lines if headers need to be installed) +# YourProject_HEADERS_DIR = $(libyourlibincludedir) +# YourProject_HEADERS_INST = $(libyourlib_1_0_HEADERS) +# YourProject_HEADERS_EXCLUDES = ... # +# +# dist-hook: \ # (or add to it if it is already there, note the vs9 items will also call the vs10 items in the process) +# $(top_builddir)/win32/vs9/YourProject.vcproj \ +# $(top_builddir)/win32/vs9/YourProject.headers # if headers need to be installed +# +# --or, if Visual Studio 2013 or later is required-- +# dist-hook: \ # (or add to it if it is already there, this does -not- call other vs items in the process) +# $(top_builddir)/win32/vs12/YourProject.vcxproj \ +# $(top_builddir)/win32/vs12/YourProject.vs12.headers # if headers need to be installed + +# Private functions + +## Transform the MSVC project filename (no filename extensions) to something which can reference through a variable +## without automake/make complaining, eg Gtk-2.0 -> Gtk_2_0 +_proj_name=$(subst /,_,$(subst -,_,$(subst .,_,$(1)))) +_proj_path_raw:=$(subst $(abs_top_srcdir),,$(abs_srcdir)) +_proj_path=$(subst /,\\,$(_proj_path_raw)) +_proj_subdir_int=$(subst \\\\,\\,\\$(_proj_path)\\) +_proj_subdir=$(subst \\.\\,\\,$(_proj_subdir_int)) + +_proj_files_raw=$(subst /,\\,$($(_proj_name)_FILES)) +_proj_files=$(subst $(srcdir)\\,,$(subst $(builddir)\\,,$(subst $(top_builddir)\\$(_proj_path)\\,\\,$(_proj_files_raw)))) +_proj_filters=$($(_proj_name)_EXCLUDES) + +_proj_headers_raw=$(subst /,\\,$($(_proj_name)_HEADERS_INST)) +_proj_headers=$(subst $(srcdir)\\,,$(subst $(builddir)\\,,$(subst $(top_builddir)\\$(_proj_path)\\,\\,$(_proj_headers_raw)))) +_proj_headers_excludes=$($(_proj_name)_HEADERS_EXCLUDES) + +_headers_dest_posix=$(subst $(includedir),,$($(_proj_name)_HEADERS_DIR)) +_headers_destdir=$(subst /,\\,$(_headers_dest_posix)) + +# +# Creates Visual Studio 2008/2010 projects from items passed in from autotools files +# $(1) - Base Name of the MSVC project files (outputs) +# + +define msvcproj-builder + +$(top_builddir)/win32/vs10/$(1).vcxproj: $(top_builddir)/win32/vs9/$(1).vcproj +$(top_builddir)/win32/vs10/$(1).vcxproj.filters: $(top_builddir)/win32/vs9/$(1).vcproj +$(1).sourcefiles: $(top_builddir)/win32/vs9/$(1).vcproj +$(1).vs10.sourcefiles: $(top_builddir)/win32/vs9/$(1).vcproj +$(1).vs10.sourcefiles.filters: $(top_builddir)/win32/vs9/$(1).vcproj + +$(top_builddir)/win32/vs9/$(1).vcproj: Makefile + -$(RM) $(top_builddir)/win32/vs9/$(1).vcproj + -$(RM) $(top_builddir)/win32/vs10/$(1).vcxproj + -$(RM) $(top_builddir)/win32/vs10/$(1).vcxproj.filters + -$(RM) $(top_builddir)/win32/vs11/$(1).vcxproj + -$(RM) $(top_builddir)/win32/vs11/$(1).vcxproj.filters + -$(RM) $(top_builddir)/win32/vs12/$(1).vcxproj + -$(RM) $(top_builddir)/win32/vs12/$(1).vcxproj.filters + -$(RM) $(top_builddir)/win32/vs14/$(1).vcxproj + -$(RM) $(top_builddir)/win32/vs14/$(1).vcxproj.filters + + + for F in $(_proj_files); do \ + case $$$$F in \ + $(_proj_filters)) \ + ;; \ + *.c|*.cpp|*.cc|*.cxx) \ + echo ' ' >>$(1).sourcefiles && \ + echo ' ' >>$(1).vs10.sourcefiles && \ + echo ' Source Files' >>$(1).vs10.sourcefiles.filters \ + ;; \ + esac; \ + done + + + $(CPP) -P - <$(top_srcdir)/win32/vs9/$(1).vcprojin >$(top_builddir)/win32/vs9/$(1).vcproj + $(CPP) -P - <$(top_srcdir)/win32/vs10/$(1).vcxprojin >$(top_builddir)/win32/vs10/$(1).vcxproj + $(CPP) -P - <$(top_srcdir)/win32/vs10/$(1).vcxproj.filtersin >$(top_builddir)/win32/vs10/$(1).vcxproj.filters + $(RM) $(1).sourcefiles + $(RM) $(1).vs10.sourcefiles + $(RM) $(1).vs10.sourcefiles.filters + +$(top_builddir)/win32/vs10/$(1).vs10.headers: $(top_builddir)/win32/vs9/$(1).headers + +$(top_builddir)/win32/vs9/$(1).headers: Makefile + -$(RM) $(top_builddir)/win32/vs9/$(1).headers + -$(RM) $(top_builddir)/win32/vs10/$(1).vs10.headers + + for F in $(_proj_headers); do \ + case $$$$F in \ + $(_proj_headers_excludes)) \ + ;; \ + *.h|*.hpp|*.hh|*.hxx) \ + echo 'copy ..\..'$(_proj_subdir)$$$$F' $$$$(CopyDir)\include'$(_headers_destdir)'\'$$$$F' ' >>$(top_builddir)/win32/vs9/$(1).headers && \ + echo 'copy ..\..'$(_proj_subdir)$$$$F' $$$$(CopyDir)\include'$(_headers_destdir)'\'$$$$F >>$(top_builddir)/win32/vs10/$(1).vs10.headers \ + ;; \ + esac; \ + done + +$(top_builddir)/win32/vs12/$(1).vcxproj.filters: $(top_builddir)/win32/vs12/$(1).vcxproj + +$(top_builddir)/win32/vs12/$(1).vcxproj: Makefile + -$(RM) $(top_builddir)/win32/vs14/$(1).vcxproj + -$(RM) $(top_builddir)/win32/vs14/$(1).vcxproj.filters + + for F in $(_proj_files); do \ + case $$$$F in \ + $(_proj_filters)) \ + ;; \ + *.c|*.cpp|*.cc|*.cxx) \ + echo ' ' >>$(1).vs12.sourcefiles && \ + echo ' Source Files' >>$(1).vs12.sourcefiles.filters \ + ;; \ + esac; \ + done + + $(CPP) -P - <$(top_srcdir)/win32/vs12/$(1).vcxprojin >$(top_builddir)/win32/vs12/$(1).vcxproj + $(CPP) -P - <$(top_srcdir)/win32/vs12/$(1).vcxproj.filtersin >$(top_builddir)/win32/vs12/$(1).vcxproj.filters + $(RM) $(1).vs12.sourcefiles + $(RM) $(1).vs12.sourcefiles.filters + +$(top_builddir)/win32/vs12/$(1).vs12.headers: Makefile + -$(RM) $(top_builddir)/win32/vs12/$(1).vs12.headers + + for F in $(_proj_headers); do \ + case $$$$F in \ + $(_proj_headers_excludes)) \ + ;; \ + *.h|*.hpp|*.hh|*.hxx) \ + echo 'copy ..\..'$(_proj_subdir)$$$$F' $$$$(CopyDir)\include'$(_headers_destdir)'\'$$$$F >>$(top_builddir)/win32/vs12/$(1).vs12.headers \ + ;; \ + esac; \ + done + +endef + +$(foreach proj,$(MSVCPROJS),$(eval $(call msvcproj-builder,$(proj)))) diff --git a/build/win32/detectenv-msvc.mak b/win32/detectenv-msvc.mak similarity index 100% rename from build/win32/detectenv-msvc.mak rename to win32/detectenv-msvc.mak diff --git a/build/win32/gen-enums.batin b/win32/gen-enums.batin similarity index 96% rename from build/win32/gen-enums.batin rename to win32/gen-enums.batin index b4f381a951..64f2cd8666 100644 --- a/build/win32/gen-enums.batin +++ b/win32/gen-enums.batin @@ -1,6 +1,6 @@ @ECHO OFF -cd ..\..\gsk +cd ..\gsk if exist gskenumtypes.h del gskenumtypes.h if exist gskenumtypes.c del gskenumtypes.c diff --git a/build/win32/gtk-introspection-msvc.mak b/win32/gtk-introspection-msvc.mak similarity index 100% rename from build/win32/gtk-introspection-msvc.mak rename to win32/gtk-introspection-msvc.mak diff --git a/build/win32/gtkpc.py b/win32/gtkpc.py similarity index 100% rename from build/win32/gtkpc.py rename to win32/gtkpc.py diff --git a/build/win32/introspection-msvc.mak b/win32/introspection-msvc.mak similarity index 98% rename from build/win32/introspection-msvc.mak rename to win32/introspection-msvc.mak index 8739844210..26501f5251 100644 --- a/build/win32/introspection-msvc.mak +++ b/win32/introspection-msvc.mak @@ -8,7 +8,7 @@ # Change or pass in or set the following to suit your environment !if "$(PREFIX)" == "" -PREFIX = ..\..\..\vs$(VSVER)\$(PLAT) +PREFIX = ..\..\vs$(VSVER)\$(PLAT) !endif !if ![setlocal] && \ diff --git a/build/win32/pc_base.py b/win32/pc_base.py similarity index 99% rename from build/win32/pc_base.py rename to win32/pc_base.py index 587ba83d19..285b6cdd87 100644 --- a/build/win32/pc_base.py +++ b/win32/pc_base.py @@ -23,7 +23,7 @@ class BasePCItems: self.libdir = '' self.prefix = '' self.srcdir = os.path.dirname(__file__) - self.top_srcdir = self.srcdir + '\\..\\..' + self.top_srcdir = self.srcdir + '\\..' self.version = '' def setup(self, argv, parser=None): diff --git a/build/win32/replace.py b/win32/replace.py similarity index 100% rename from build/win32/replace.py rename to win32/replace.py diff --git a/build/win32/vs12/Makefile.am b/win32/vs12/Makefile.am similarity index 88% rename from build/win32/vs12/Makefile.am rename to win32/vs12/Makefile.am index dee68b9b9a..b6bf35ac7b 100644 --- a/build/win32/vs12/Makefile.am +++ b/win32/vs12/Makefile.am @@ -62,9 +62,9 @@ EXTRA_DIST += \ DISTCLEANFILES = \ $(GENERATED_ITEMS) -gtk4-install.props: $(top_srcdir)/build/win32/vs12/gtk4-install.propsin $(MSVC12_HEADERS_LISTS) - -$(RM) $(top_builddir)/build/win32/vs14/gtk4-install.props - $(CPP) -P - <$(top_srcdir)/build/win32/vs12/gtk4-install.propsin >$@ +gtk4-install.props: $(top_srcdir)/win32/vs12/gtk4-install.propsin $(MSVC12_HEADERS_LISTS) + -$(RM) $(top_builddir)/win32/vs14/gtk4-install.props + $(CPP) -P - <$(top_srcdir)/win32/vs12/gtk4-install.propsin >$@ rm $(MSVC12_HEADERS_LISTS) -include $(top_srcdir)/git.mk diff --git a/build/win32/vs12/README.txt b/win32/vs12/README.txt similarity index 100% rename from build/win32/vs12/README.txt rename to win32/vs12/README.txt diff --git a/build/win32/vs12/gdk-4.vcxproj.filtersin b/win32/vs12/gdk-4.vcxproj.filtersin similarity index 90% rename from build/win32/vs12/gdk-4.vcxproj.filtersin rename to win32/vs12/gdk-4.vcxproj.filtersin index 598c1cd94a..1a0cec0c3e 100644 --- a/build/win32/vs12/gdk-4.vcxproj.filtersin +++ b/win32/vs12/gdk-4.vcxproj.filtersin @@ -16,6 +16,6 @@ #include "gdk-4.vs12.sourcefiles.filters" - Source Files + Source Files diff --git a/build/win32/vs12/gdk-4.vcxprojin b/win32/vs12/gdk-4.vcxprojin similarity index 91% rename from build/win32/vs12/gdk-4.vcxprojin rename to win32/vs12/gdk-4.vcxprojin index 9b63e3a4e0..911f23b612 100644 --- a/build/win32/vs12/gdk-4.vcxprojin +++ b/win32/vs12/gdk-4.vcxprojin @@ -69,7 +69,7 @@ Disabled - ..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories) + ..\..\gdk;..\..\gdk\win32;%(AdditionalIncludeDirectories) _DEBUG;G_ENABLE_DEBUG;$(GdkDefines);%(PreprocessorDefinitions) true EnableFastChecks @@ -82,7 +82,7 @@ - ..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories) + ..\..\gdk;..\..\gdk\win32;%(AdditionalIncludeDirectories) $(GdkDefines);%(PreprocessorDefinitions) MultiThreadedDLL @@ -94,7 +94,7 @@ Disabled - ..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories) + ..\..\gdk;..\..\gdk\win32;%(AdditionalIncludeDirectories) _DEBUG;G_ENABLE_DEBUG;$(GdkDefines);%(PreprocessorDefinitions) true EnableFastChecks @@ -107,7 +107,7 @@ - ..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories) + ..\..\gdk;..\..\gdk\win32;%(AdditionalIncludeDirectories) $(GdkDefines);%(PreprocessorDefinitions) MultiThreadedDLL @@ -118,7 +118,7 @@ #include "gdk-4.vs12.sourcefiles" - + diff --git a/build/win32/vs12/gdk4-win32.vcxproj.filtersin b/win32/vs12/gdk4-win32.vcxproj.filtersin similarity index 100% rename from build/win32/vs12/gdk4-win32.vcxproj.filtersin rename to win32/vs12/gdk4-win32.vcxproj.filtersin diff --git a/build/win32/vs12/gdk4-win32.vcxprojin b/win32/vs12/gdk4-win32.vcxprojin similarity index 92% rename from build/win32/vs12/gdk4-win32.vcxprojin rename to win32/vs12/gdk4-win32.vcxprojin index 4963618d02..6546e4bd82 100644 --- a/build/win32/vs12/gdk4-win32.vcxprojin +++ b/win32/vs12/gdk4-win32.vcxprojin @@ -69,7 +69,7 @@ Disabled - ..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories) + ..\..\gdk;..\..\gdk\win32;%(AdditionalIncludeDirectories) _DEBUG;G_ENABLE_DEBUG;$(GdkDefines);INSIDE_GDK_WIN32;%(PreprocessorDefinitions) true EnableFastChecks @@ -82,7 +82,7 @@ - ..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories) + ..\..\gdk;..\..\gdk\win32;%(AdditionalIncludeDirectories) $(GdkDefines);INSIDE_GDK_WIN32;%(PreprocessorDefinitions) MultiThreadedDLL @@ -94,7 +94,7 @@ Disabled - ..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories) + ..\..\gdk;..\..\gdk\win32;%(AdditionalIncludeDirectories) _DEBUG;G_ENABLE_DEBUG;$(GdkDefines);INSIDE_GDK_WIN32;%(PreprocessorDefinitions) true EnableFastChecks @@ -107,7 +107,7 @@ - ..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories) + ..\..\gdk;..\..\gdk\win32;%(AdditionalIncludeDirectories) $(GdkDefines);INSIDE_GDK_WIN32;%(PreprocessorDefinitions) MultiThreadedDLL diff --git a/win32/vs12/gsk-4.vcxproj.filtersin b/win32/vs12/gsk-4.vcxproj.filtersin new file mode 100644 index 0000000000..2c9eaa3ae3 --- /dev/null +++ b/win32/vs12/gsk-4.vcxproj.filtersin @@ -0,0 +1,39 @@ + + + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + + Resource Files + Resource Files + + +#include "gsk-4.vs12.sourcefiles.filters" + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + + diff --git a/build/win32/vs12/gsk-4.vcxprojin b/win32/vs12/gsk-4.vcxprojin old mode 100755 new mode 100644 similarity index 84% rename from build/win32/vs12/gsk-4.vcxprojin rename to win32/vs12/gsk-4.vcxprojin index 0f1a125920..596c456f9a --- a/build/win32/vs12/gsk-4.vcxprojin +++ b/win32/vs12/gsk-4.vcxprojin @@ -123,7 +123,7 @@ Disabled - ..\..\..\gsk;..\..\..\gdk;%(AdditionalIncludeDirectories) + ..\..\gsk;..\..\gdk;%(AdditionalIncludeDirectories) _DEBUG;G_ENABLE_DEBUG;$(GskDefines);%(PreprocessorDefinitions) true EnableFastChecks @@ -137,7 +137,7 @@ Disabled - ..\..\..\gsk;..\..\..\gdk;%(AdditionalIncludeDirectories) + ..\..\gsk;..\..\gdk;%(AdditionalIncludeDirectories) _DEBUG;G_ENABLE_DEBUG;$(GskDefines);%(PreprocessorDefinitions) true EnableFastChecks @@ -150,7 +150,7 @@ - ..\..\..\gsk;..\..\..\gdk;%(AdditionalIncludeDirectories) + ..\..\gsk;..\..\gdk;%(AdditionalIncludeDirectories) $(GskDefines);%(PreprocessorDefinitions) MultiThreadedDLL @@ -161,7 +161,7 @@ - ..\..\..\gsk;..\..\..\gdk;%(AdditionalIncludeDirectories) + ..\..\gsk;..\..\gdk;%(AdditionalIncludeDirectories) $(GskDefines);%(PreprocessorDefinitions) MultiThreadedDLL @@ -173,7 +173,7 @@ Disabled - ..\..\..\gsk;..\..\..\gdk;%(AdditionalIncludeDirectories) + ..\..\gsk;..\..\gdk;%(AdditionalIncludeDirectories) _DEBUG;G_ENABLE_DEBUG;$(GskDefines);%(PreprocessorDefinitions) true EnableFastChecks @@ -187,7 +187,7 @@ Disabled - ..\..\..\gsk;..\..\..\gdk;%(AdditionalIncludeDirectories) + ..\..\gsk;..\..\gdk;%(AdditionalIncludeDirectories) _DEBUG;G_ENABLE_DEBUG;$(GskDefines);%(PreprocessorDefinitions) true EnableFastChecks @@ -200,7 +200,7 @@ - ..\..\..\gsk;..\..\..\gdk;%(AdditionalIncludeDirectories) + ..\..\gsk;..\..\gdk;%(AdditionalIncludeDirectories) $(GskDefines);%(PreprocessorDefinitions) MultiThreadedDLL @@ -211,7 +211,7 @@ - ..\..\..\gsk;..\..\..\gdk;%(AdditionalIncludeDirectories) + ..\..\gsk;..\..\gdk;%(AdditionalIncludeDirectories) $(GskDefines);%(PreprocessorDefinitions) MultiThreadedDLL @@ -221,94 +221,94 @@ - + Generating GSK enumeration sources... $(GenGSKEnumSrcs) - ..\..\..\gsk\gskenumtypes.h;..\..\..\gsk\gskenumtypes.c;%(Outputs) + ..\..\gsk\gskenumtypes.h;..\..\gsk\gskenumtypes.c;%(Outputs) Generating GSK enumeration sources... $(GenGSKEnumSrcs) - ..\..\..\gsk\gskenumtypes.h;..\..\..\gsk\gskenumtypes.c;%(Outputs) + ..\..\gsk\gskenumtypes.h;..\..\gsk\gskenumtypes.c;%(Outputs) Generating GSK enumeration sources... $(GenGSKEnumSrcs) - ..\..\..\gsk\gskenumtypes.h;..\..\..\gsk\gskenumtypes.c;%(Outputs) + ..\..\gsk\gskenumtypes.h;..\..\gsk\gskenumtypes.c;%(Outputs) Generating GSK enumeration sources... $(GenGSKEnumSrcs) - ..\..\..\gsk\gskenumtypes.h;..\..\..\gsk\gskenumtypes.c;%(Outputs) + ..\..\gsk\gskenumtypes.h;..\..\gsk\gskenumtypes.c;%(Outputs) - + Generating GSK resource sources... $(GenGSKRsrcSrcs) - ..\..\..\gsk\gskresources.h;..\..\..\gsk\gskresources.c;..\..\..\gsk\gsk.gresource.xml;%(Outputs) + ..\..\gsk\gskresources.h;..\..\gsk\gskresources.c;..\..\gsk\gsk.gresource.xml;%(Outputs) Generating GSK resource sources... $(GenGSKRsrcSrcs) - ..\..\..\gsk\gskresources.h;..\..\..\gsk\gskresources.c;..\..\..\gsk\gsk.gresource.xml;%(Outputs) + ..\..\gsk\gskresources.h;..\..\gsk\gskresources.c;..\..\gsk\gsk.gresource.xml;%(Outputs) Generating GSK resource sources... $(GenGSKRsrcSrcs) - ..\..\..\gsk\gskresources.h;..\..\..\gsk\gskresources.c;..\..\..\gsk\gsk.gresource.xml;%(Outputs) + ..\..\gsk\gskresources.h;..\..\gsk\gskresources.c;..\..\gsk\gsk.gresource.xml;%(Outputs) Generating GSK resource sources... $(GenGSKRsrcSrcs) - ..\..\..\gsk\gskresources.h;..\..\..\gsk\gskresources.c;..\..\..\gsk\gsk.gresource.xml;%(Outputs) + ..\..\gsk\gskresources.h;..\..\gsk\gskresources.c;..\..\gsk\gsk.gresource.xml;%(Outputs) #include "gsk-4.vs12.sourcefiles" - + true true - + true true - + true true - + true true - + true true - + true true - + true true - + true true - + true true - + true true - + true true - + true true - + true true - + true true - + true true diff --git a/build/win32/vs12/gtk+-4.sln b/win32/vs12/gtk+-4.sln similarity index 100% rename from build/win32/vs12/gtk+-4.sln rename to win32/vs12/gtk+-4.sln diff --git a/win32/vs12/gtk-4.vcxproj.filtersin b/win32/vs12/gtk-4.vcxproj.filtersin new file mode 100644 index 0000000000..0696b6f146 --- /dev/null +++ b/win32/vs12/gtk-4.vcxproj.filtersin @@ -0,0 +1,46 @@ + + + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + + Resource Files + + + Resource Files + Resource Files + Resource Files + + +#include "gtk-4.vs12.sourcefiles.filters" + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + + + Resource Files + + diff --git a/build/win32/vs12/gtk-4.vcxprojin b/win32/vs12/gtk-4.vcxprojin similarity index 85% rename from build/win32/vs12/gtk-4.vcxprojin rename to win32/vs12/gtk-4.vcxprojin index 5c17aea88f..1561e15479 100644 --- a/build/win32/vs12/gtk-4.vcxprojin +++ b/win32/vs12/gtk-4.vcxprojin @@ -129,7 +129,7 @@ Disabled - ..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories) + ..\..\gtk;..\..\gdk;..\..\gdk\win32;%(AdditionalIncludeDirectories) _DEBUG;G_ENABLE_DEBUG;$(GtkDefines);%(PreprocessorDefinitions) true EnableFastChecks @@ -153,7 +153,7 @@ Disabled - ..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories) + ..\..\gtk;..\..\gdk;..\..\gdk\win32;%(AdditionalIncludeDirectories) _DEBUG;G_ENABLE_DEBUG;$(GtkDefines);%(PreprocessorDefinitions) true EnableFastChecks @@ -176,7 +176,7 @@ - ..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories) + ..\..\gtk;..\..\gdk;..\..\gdk\win32;%(AdditionalIncludeDirectories) $(GtkDefines);%(PreprocessorDefinitions) MultiThreadedDLL @@ -199,7 +199,7 @@ - ..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories) + ..\..\gtk;..\..\gdk;..\..\gdk\win32;%(AdditionalIncludeDirectories) $(GtkDefines);%(PreprocessorDefinitions) MultiThreadedDLL @@ -223,7 +223,7 @@ Disabled - ..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories) + ..\..\gtk;..\..\gdk;..\..\gdk\win32;%(AdditionalIncludeDirectories) _DEBUG;G_ENABLE_DEBUG;$(GtkDefines);%(PreprocessorDefinitions) true EnableFastChecks @@ -247,7 +247,7 @@ Disabled - ..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories) + ..\..\gtk;..\..\gdk;..\..\gdk\win32;%(AdditionalIncludeDirectories) _DEBUG;G_ENABLE_DEBUG;$(GtkDefines);%(PreprocessorDefinitions) true EnableFastChecks @@ -270,7 +270,7 @@ - ..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories) + ..\..\gtk;..\..\gdk;..\..\gdk\win32;%(AdditionalIncludeDirectories) $(GtkDefines);%(PreprocessorDefinitions) MultiThreadedDLL @@ -293,7 +293,7 @@ - ..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories) + ..\..\gtk;..\..\gdk;..\..\gdk\win32;%(AdditionalIncludeDirectories) $(GtkDefines);%(PreprocessorDefinitions) MultiThreadedDLL @@ -315,74 +315,74 @@ - + Generating GTK+ DBus Sources... $(GenerateGtkDbusBuiltSources) - ..\..\..\gtk\gtkdbusgenerated.c;..\..\..\gtk\gtkdbusgenerated.h;%(Outputs) + ..\..\gtk\gtkdbusgenerated.c;..\..\gtk\gtkdbusgenerated.h;%(Outputs) Generating GTK+ DBus Sources... $(GenerateGtkDbusBuiltSources) - ..\..\..\gtk\gtkdbusgenerated.c;..\..\..\gtk\gtkdbusgenerated.h;%(Outputs) + ..\..\gtk\gtkdbusgenerated.c;..\..\gtk\gtkdbusgenerated.h;%(Outputs) Generating GTK+ DBus Sources... $(GenerateGtkDbusBuiltSources) - ..\..\..\gtk\gtkdbusgenerated.c;..\..\..\gtk\gtkdbusgenerated.h;%(Outputs) + ..\..\gtk\gtkdbusgenerated.c;..\..\gtk\gtkdbusgenerated.h;%(Outputs) Generating GTK+ DBus Sources... $(GenerateGtkDbusBuiltSources) - ..\..\..\gtk\gtkdbusgenerated.c;..\..\..\gtk\gtkdbusgenerated.h;%(Outputs) + ..\..\gtk\gtkdbusgenerated.c;..\..\gtk\gtkdbusgenerated.h;%(Outputs) - + Copying GTK+ Win32 Version Resource... $(CopyGtkWin32RC) - ..\..\..\gtk\gtk-win32.rc;%(Outputs) + ..\..\gtk\gtk-win32.rc;%(Outputs) Copying GTK+ Win32 Version Resource... $(CopyGtkWin32RC) - ..\..\..\gtk\gtk-win32.rc;%(Outputs) + ..\..\gtk\gtk-win32.rc;%(Outputs) Copying GTK+ Win32 Version Resource... $(CopyGtkWin32RC) - ..\..\..\gtk\gtk-win32.rc;%(Outputs) + ..\..\gtk\gtk-win32.rc;%(Outputs) Copying GTK+ Win32 Version Resource... $(CopyGtkWin32RC) - ..\..\..\gtk\gtk-win32.rc;%(Outputs) + ..\..\gtk\gtk-win32.rc;%(Outputs) - + Generating GTK+ Win32 Manifest... $(GenerateGtkWin32Manifest) - ..\..\..\gtk\libgtk4.manifest;%(Outputs) + ..\..\gtk\libgtk4.manifest;%(Outputs) Generating GTK+ Win32 Manifest... $(GenerateGtkWin32Manifest) - ..\..\..\gtk\libgtk4.manifest;%(Outputs) + ..\..\gtk\libgtk4.manifest;%(Outputs) Generating GTK+ Win32 Manifest... $(GenerateGtkWin32Manifest) - ..\..\..\gtk\libgtk4.manifest;%(Outputs) + ..\..\gtk\libgtk4.manifest;%(Outputs) Generating GTK+ Win32 Manifest... $(GenerateGtkWin32Manifest) - ..\..\..\gtk\libgtk4.manifest;%(Outputs) + ..\..\gtk\libgtk4.manifest;%(Outputs) - - ..\..\..\gdk\win32\rc;%(AdditionalIncludeDirectories) + + ..\..\gdk\win32\rc;%(AdditionalIncludeDirectories) #include "gtk-4.vs12.sourcefiles" - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - + diff --git a/build/win32/vs12/gtk4-build-defines.props b/win32/vs12/gtk4-build-defines.props similarity index 89% rename from build/win32/vs12/gtk4-build-defines.props rename to win32/vs12/gtk4-build-defines.props index 3a8523c1fe..e770e39789 100644 --- a/build/win32/vs12/gtk4-build-defines.props +++ b/win32/vs12/gtk4-build-defines.props @@ -24,7 +24,7 @@ - ..\..\..;$(GlibEtcInstallRoot)\include\gdk-pixbuf-2.0;$(GlibEtcInstallRoot)\include\pango-1.0;$(GlibEtcInstallRoot)\include\atk-1.0;$(GlibEtcInstallRoot)\include\graphene-1.0;$(GlibEtcInstallRoot)\lib\graphene-1.0\include;$(GlibEtcInstallRoot)\include\cairo;$(GlibEtcInstallRoot)\include\gio-win32-2.0;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include;%(AdditionalIncludeDirectories) + ..\..;$(GlibEtcInstallRoot)\include\gdk-pixbuf-2.0;$(GlibEtcInstallRoot)\include\pango-1.0;$(GlibEtcInstallRoot)\include\atk-1.0;$(GlibEtcInstallRoot)\include\graphene-1.0;$(GlibEtcInstallRoot)\lib\graphene-1.0\include;$(GlibEtcInstallRoot)\include\cairo;$(GlibEtcInstallRoot)\include\gio-win32-2.0;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include;%(AdditionalIncludeDirectories) HAVE_CONFIG_H;G_DISABLE_SINGLE_INCLUDES;ATK_DISABLE_SINGLE_INCLUDES;GDK_PIXBUF_DISABLE_SINGLE_INCLUDES;GTK_DISABLE_SINGLE_INCLUDES;_USE_MATH_DEFINES;%(PreprocessorDefinitions) msvc_recommended_pragmas.h;%(ForcedIncludeFiles) true diff --git a/build/win32/vs12/gtk4-builder-tool.vcxproj b/win32/vs12/gtk4-builder-tool.vcxproj similarity index 99% rename from build/win32/vs12/gtk4-builder-tool.vcxproj rename to win32/vs12/gtk4-builder-tool.vcxproj index c7f8dbf990..347c385a7e 100644 --- a/build/win32/vs12/gtk4-builder-tool.vcxproj +++ b/win32/vs12/gtk4-builder-tool.vcxproj @@ -161,7 +161,7 @@ - + diff --git a/win32/vs12/gtk4-builder-tool.vcxproj.filters b/win32/vs12/gtk4-builder-tool.vcxproj.filters new file mode 100644 index 0000000000..e88646b264 --- /dev/null +++ b/win32/vs12/gtk4-builder-tool.vcxproj.filters @@ -0,0 +1,20 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + + Sources + + diff --git a/build/win32/vs12/gtk4-demo-application.vcxproj.filtersin b/win32/vs12/gtk4-demo-application.vcxproj.filtersin similarity index 100% rename from build/win32/vs12/gtk4-demo-application.vcxproj.filtersin rename to win32/vs12/gtk4-demo-application.vcxproj.filtersin diff --git a/build/win32/vs12/gtk4-demo-application.vcxprojin b/win32/vs12/gtk4-demo-application.vcxprojin similarity index 100% rename from build/win32/vs12/gtk4-demo-application.vcxprojin rename to win32/vs12/gtk4-demo-application.vcxprojin diff --git a/build/win32/vs12/gtk4-demo.vcxproj.filtersin b/win32/vs12/gtk4-demo.vcxproj.filtersin similarity index 100% rename from build/win32/vs12/gtk4-demo.vcxproj.filtersin rename to win32/vs12/gtk4-demo.vcxproj.filtersin diff --git a/build/win32/vs12/gtk4-demo.vcxprojin b/win32/vs12/gtk4-demo.vcxprojin similarity index 94% rename from build/win32/vs12/gtk4-demo.vcxprojin rename to win32/vs12/gtk4-demo.vcxprojin index 8afcdc8c4f..3a74d29433 100644 --- a/build/win32/vs12/gtk4-demo.vcxprojin +++ b/win32/vs12/gtk4-demo.vcxprojin @@ -73,7 +73,7 @@ Disabled - ..\..\..\gdk;..\..\..\gtk;%(AdditionalIncludeDirectories) + ..\..\gdk;..\..\gtk;%(AdditionalIncludeDirectories) _DEBUG;$(GtkPrefixDefine);%(PreprocessorDefinitions) true EnableFastChecks @@ -96,7 +96,7 @@ - ..\..\..\gdk;..\..\..\gtk;%(AdditionalIncludeDirectories) + ..\..\gdk;..\..\gtk;%(AdditionalIncludeDirectories) $(GtkPrefixDefine);%(PreprocessorDefinitions) MultiThreadedDLL @@ -121,7 +121,7 @@ Disabled - ..\..\..\gdk;..\..\..\gtk;%(AdditionalIncludeDirectories) + ..\..\gdk;..\..\gtk;%(AdditionalIncludeDirectories) _DEBUG;$(GtkPrefixDefine);%(PreprocessorDefinitions) true EnableFastChecks @@ -144,7 +144,7 @@ - ..\..\..\gdk;..\..\..\gtk;%(AdditionalIncludeDirectories) + ..\..\gdk;..\..\gtk;%(AdditionalIncludeDirectories) $(GtkPrefixDefine);%(PreprocessorDefinitions) MultiThreadedDLL diff --git a/build/win32/vs12/gtk4-encode-symbolic-svg.vcxproj b/win32/vs12/gtk4-encode-symbolic-svg.vcxproj similarity index 94% rename from build/win32/vs12/gtk4-encode-symbolic-svg.vcxproj rename to win32/vs12/gtk4-encode-symbolic-svg.vcxproj index e8178bd96b..4e9a88b290 100644 --- a/build/win32/vs12/gtk4-encode-symbolic-svg.vcxproj +++ b/win32/vs12/gtk4-encode-symbolic-svg.vcxproj @@ -73,7 +73,7 @@ Disabled - ..\..\..\gdk;%(AdditionalIncludeDirectories) + ..\..\gdk;%(AdditionalIncludeDirectories) _DEBUG;%(PreprocessorDefinitions) true EnableFastChecks @@ -93,7 +93,7 @@ MaxSpeed - ..\..\..\gdk;%(AdditionalIncludeDirectories) + ..\..\gdk;%(AdditionalIncludeDirectories) true %(PreprocessorDefinitions) MultiThreadedDLL @@ -118,7 +118,7 @@ Disabled - ..\..\..\gdk;%(AdditionalIncludeDirectories) + ..\..\gdk;%(AdditionalIncludeDirectories) _DEBUG;%(PreprocessorDefinitions) true EnableFastChecks @@ -141,7 +141,7 @@ MaxSpeed - ..\..\..\gdk;%(AdditionalIncludeDirectories) + ..\..\gdk;%(AdditionalIncludeDirectories) true %(PreprocessorDefinitions) MultiThreadedDLL @@ -161,7 +161,7 @@ - + diff --git a/build/win32/vs12/gtk4-encode-symbolic-svg.vcxproj.filters b/win32/vs12/gtk4-encode-symbolic-svg.vcxproj.filters similarity index 89% rename from build/win32/vs12/gtk4-encode-symbolic-svg.vcxproj.filters rename to win32/vs12/gtk4-encode-symbolic-svg.vcxproj.filters index 22a3155d84..3377263529 100644 --- a/build/win32/vs12/gtk4-encode-symbolic-svg.vcxproj.filters +++ b/win32/vs12/gtk4-encode-symbolic-svg.vcxproj.filters @@ -15,6 +15,6 @@ - Sources + Sources diff --git a/win32/vs12/gtk4-gen-srcs.props b/win32/vs12/gtk4-gen-srcs.props new file mode 100644 index 0000000000..a085324e96 --- /dev/null +++ b/win32/vs12/gtk4-gen-srcs.props @@ -0,0 +1,100 @@ + + + + + + + copy ..\..\config.h.win32 ..\..\config.h + +if exist ..\..\MSVC_$(Configuration) goto DONE_GDKCONFIG_H + +if exist ..\..\gdk\gdkconfig.h del ..\..\gdk\gdkconfig.h +if exist ..\..\GDK_VULKAN_BUILD del ..\..\GDK_VULKAN_BUILD +if exist ..\..\MSVC_$(Configuration)_Vulkan del ..\..\MSVC_$(Configuration)_Vulkan +if exist $(Configuration)\$(Platform)\bin\$(GtkDllPrefix)gdk$(GtkDllSuffix).dll del $(Configuration)\$(Platform)\bin\$(GtkDllPrefix)gdk$(GtkDllSuffix).dll +if exist $(Configuration)\$(Platform)\bin\gdk-$(ApiVersion).lib del $(Configuration)\$(Platform)\bin\gdk-$(ApiVersion).lib +if "$(Configuration)" == "Release" del ..\..\MSVC_Debug +if "$(Configuration)" == "Debug" del ..\..\MSVC_Release +copy ..\..\gdk\gdkconfig.h.win32 ..\..\gdk\gdkconfig.h +copy ..\..\gdk\gdkconfig.h.win32 ..\..\GDK_WIN32ONLY_BUILD +echo $(Configuration) > ..\..\MSVC_$(Configuration) + +:DONE_GDKCONFIG_H + + +if exist ..\..\MSVC_$(Configuration)_Vulkan goto DONE_GDKCONFIG_H + +if exist ..\..\gdk\gdkconfig.h del ..\..\gdk\gdkconfig.h +if exist ..\..\GDK_WIN32ONLY_BUILD del ..\..\GDK_WIN32ONLY_BUILD +if exist ..\..\MSVC_Release del ..\..\MSVC_Release +if exist ..\..\MSVC_Debug del ..\..\MSVC_Debug + +if "$(Configuration)" == "Release_Vulkan" del ..\..\MSVC_Debug_Vulkan +if "$(Configuration)" == "Debug_Vulkan" del ..\..\MSVC_Release_Vulkan + +copy ..\..\gdk\gdkconfig.h.win32_vulkan ..\..\gdk\gdkconfig.h +copy ..\..\gdk\gdkconfig.h.win32_vulkan ..\..\GDK_VULKAN_BUILD +echo $(Configuration) > ..\..\MSVC_$(Configuration)_Vulkan + +:DONE_GDKCONFIG_H + + $(GlibEtcInstallRoot)\bin\gdbus-codegen --interface-prefix org.Gtk. --c-namespace _Gtk --generate-c-code gtkdbusgenerated ./gtkdbusinterfaces.xml + cd ..\..\gtk & $(PythonPath)\python $(GDbusCodeGenCmd) & cd $(SolutionDir) + cd ..\..\gtk & $(PythonPathX64)\python $(GDbusCodeGenCmd) & cd $(SolutionDir) + copy ..\..\gtk\gtk-win32.rc.body ..\..\gtk\gtk-win32.rc + $(PythonPath)\python ..\replace.py --action=replace-var --input=..\..\gtk\libgtk4.manifest.in --output=..\..\gtk\libgtk4.manifest --var=EXE_MANIFEST_ARCHITECTURE --outstring=* + copy ..\..\demos\gtk-demo\demos.h.win32 ..\..\demos\gtk-demo\demos.h + (cd ..) & (call gen-enums.bat $(GlibEtcInstallRoot)) & (cd $(SolutionDir)) + +echo ^<?xml version='1.0' encoding='UTF-8'?^> > ..\..\gsk\gsk.gresource.xml +echo ^<gresources^> >> ..\..\gsk\gsk.gresource.xml +echo ^<gresource prefix='/org/gtk/libgsk'^> >> ..\..\gsk\gsk.gresource.xml +for /f %%f in ('dir /b ..\..\gsk\resources\glsl\*') do echo ^<file alias='glsl/%%f'^>resources/glsl/%%f^</file^> >> ..\..\gsk\gsk.gresource.xml +for /f %%f in ('dir /b ..\..\gsk\resources\vulkan\*.spv') do echo ^<file alias='vulkan/%%f'^>resources/vulkan/%%f^</file^> >> ..\..\gsk\gsk.gresource.xml +for /f %%f in ('dir /b ..\..\gsk\resources\vulkan\*.glsl') do echo ^<file alias='vulkan/%%f'^>resources/vulkan/%%f^</file^> >> ..\..\gsk\gsk.gresource.xml +echo ^</gresource^> >> ..\..\gsk\gsk.gresource.xml +echo ^</gresources^> >> ..\..\gsk\gsk.gresource.xml + +$(GlibEtcInstallRoot)\bin\glib-compile-resources.exe --sourcedir=..\..\gsk --c-name _gsk --generate-header --manual-register --target=..\..\gsk\gskresources.h ..\..\gsk\gsk.gresource.xml +$(GlibEtcInstallRoot)\bin\glib-compile-resources.exe --sourcedir=..\..\gsk --c-name _gsk --generate-source --manual-register --target=..\..\gsk\gskresources.c ..\..\gsk\gsk.gresource.xml + + + + <_PropertySheetDisplayName>gtk4gensrcsprops + + + + $(GenConfigH) + + + $(GenGdkConfigHWin32) + + + $(GenGdkConfigHVulkan) + + + $(GDbusCodeGenCmd) + + + $(GenerateGtkDbusBuiltSources) + + + $(GenerateGtkDbusBuiltSourcesX64) + + + $(CopyGtkWin32RC) + + + $(GenerateGtkWin32Manifest) + + + $(CopyDemosH) + + + $(GenGSKEnumSrcs) + + + $(GenGSKRsrcSrcs) + + + diff --git a/build/win32/vs12/gtk4-icon-browser.vcxproj.filtersin b/win32/vs12/gtk4-icon-browser.vcxproj.filtersin similarity index 100% rename from build/win32/vs12/gtk4-icon-browser.vcxproj.filtersin rename to win32/vs12/gtk4-icon-browser.vcxproj.filtersin diff --git a/build/win32/vs12/gtk4-icon-browser.vcxprojin b/win32/vs12/gtk4-icon-browser.vcxprojin similarity index 93% rename from build/win32/vs12/gtk4-icon-browser.vcxprojin rename to win32/vs12/gtk4-icon-browser.vcxprojin index 5d2008deb3..48e9c19458 100644 --- a/build/win32/vs12/gtk4-icon-browser.vcxprojin +++ b/win32/vs12/gtk4-icon-browser.vcxprojin @@ -73,7 +73,7 @@ Disabled - ..\..\..\demos\icon-browser;%(AdditionalIncludeDirectories) + ..\..\demos\icon-browser;%(AdditionalIncludeDirectories) _DEBUG;%(PreprocessorDefinitions) true EnableFastChecks @@ -92,7 +92,7 @@ MaxSpeed - ..\..\..\demos\icon-browser;%(AdditionalIncludeDirectories) + ..\..\demos\icon-browser;%(AdditionalIncludeDirectories) true %(PreprocessorDefinitions) MultiThreadedDLL @@ -116,7 +116,7 @@ Disabled - ..\..\..\demos\icon-browser;%(AdditionalIncludeDirectories) + ..\..\demos\icon-browser;%(AdditionalIncludeDirectories) _DEBUG;%(PreprocessorDefinitions) true EnableFastChecks @@ -138,7 +138,7 @@ MaxSpeed - ..\..\..\demos\icon-browser;%(AdditionalIncludeDirectories) + ..\..\demos\icon-browser;%(AdditionalIncludeDirectories) true %(PreprocessorDefinitions) MultiThreadedDLL diff --git a/build/win32/vs12/gtk4-install.propsin b/win32/vs12/gtk4-install.propsin similarity index 92% rename from build/win32/vs12/gtk4-install.propsin rename to win32/vs12/gtk4-install.propsin index 8044ab478f..7a9f2b3747 100644 --- a/build/win32/vs12/gtk4-install.propsin +++ b/win32/vs12/gtk4-install.propsin @@ -79,7 +79,7 @@ copy "..\gtk+-$(ApiVersion).pc" "$(CopyDir)\lib\pkgconfig\gtk+-win32-$(ApiVersio echo off mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gdk\win32 mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gdk\deprecated -copy ..\..\..\gdk\win32\gdkwin32.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk +copy ..\..\gdk\win32\gdkwin32.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk #include "gdk-4.vs12.headers" #include "gdk4-win32.vs12.headers" @@ -90,18 +90,18 @@ mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated #include "gtk-4.vs12.headers" -for %%s in (16 22 24 32 48 256) do ((mkdir $(CopyDir)\share\icons\hicolor\%%sx%%s\apps) & (copy /b ..\..\..\demos\gtk-demo\data\%%sx%%s\gtk$(ApiVersionShort)-demo.png $(CopyDir)\share\icons\hicolor\%%sx%%s\apps)) +for %%s in (16 22 24 32 48 256) do ((mkdir $(CopyDir)\share\icons\hicolor\%%sx%%s\apps) & (copy /b ..\..\demos\gtk-demo\data\%%sx%%s\gtk$(ApiVersionShort)-demo.png $(CopyDir)\share\icons\hicolor\%%sx%%s\apps)) mkdir $(CopyDir)\share\glib-2.0\schemas -copy ..\..\..\gtk\org.gtk.Settings.FileChooser.gschema.xml $(CopyDir)\share\glib-2.0\schemas -copy ..\..\..\gtk\org.gtk.Settings.ColorChooser.gschema.xml $(CopyDir)\share\glib-2.0\schemas -copy ..\..\..\gtk\org.gtk.Settings.Debug.gschema.xml $(CopyDir)\share\glib-2.0\schemas -copy ..\..\..\demos\gtk-demo\org.gtk.Demo.gschema.xml $(CopyDir)\share\glib-2.0\schemas +copy ..\..\gtk\org.gtk.Settings.FileChooser.gschema.xml $(CopyDir)\share\glib-2.0\schemas +copy ..\..\gtk\org.gtk.Settings.ColorChooser.gschema.xml $(CopyDir)\share\glib-2.0\schemas +copy ..\..\gtk\org.gtk.Settings.Debug.gschema.xml $(CopyDir)\share\glib-2.0\schemas +copy ..\..\demos\gtk-demo\org.gtk.Demo.gschema.xml $(CopyDir)\share\glib-2.0\schemas echo "Compiling gsettings XML Files..." $(GlibEtcInstallRoot)\bin\glib-compile-schemas.exe $(CopyDir)\share\glib-2.0\schemas -echo "Generating icon cache......" +echo "Generating icon cache..." $(CopyDir)\bin\gtk$(ApiVersionShort)-update-icon-cache.exe --ignore-theme-index --force "$(CopyDir)\share\icons\hicolor" $(PythonPath)\python ..\gtkpc.py --prefix=$(CopyDir) --version=$(GtkVersion) --host=i686-pc-vs$(VSVer) diff --git a/build/win32/vs12/gtk4-install.vcxproj b/win32/vs12/gtk4-install.vcxproj similarity index 99% rename from build/win32/vs12/gtk4-install.vcxproj rename to win32/vs12/gtk4-install.vcxproj index 7477b4b8f3..8ab6e0d903 100644 --- a/build/win32/vs12/gtk4-install.vcxproj +++ b/win32/vs12/gtk4-install.vcxproj @@ -147,7 +147,7 @@ - + Installing Build Results... $(GtkPCFiles) $(GtkDoInstallBin)$(GtkDoInstall)$(GtkPostInstall) diff --git a/build/win32/vs12/gtk4-install.vcxproj.filters b/win32/vs12/gtk4-install.vcxproj.filters similarity index 84% rename from build/win32/vs12/gtk4-install.vcxproj.filters rename to win32/vs12/gtk4-install.vcxproj.filters index c75e9b3cc0..6be701aa89 100644 --- a/build/win32/vs12/gtk4-install.vcxproj.filters +++ b/win32/vs12/gtk4-install.vcxproj.filters @@ -7,7 +7,7 @@ - Resource Files + Resource Files Resource Files diff --git a/build/win32/vs12/gtk4-prebuild.vcxproj b/win32/vs12/gtk4-prebuild.vcxproj similarity index 89% rename from build/win32/vs12/gtk4-prebuild.vcxproj rename to win32/vs12/gtk4-prebuild.vcxproj index 3b497bdd15..0919f165cc 100644 --- a/build/win32/vs12/gtk4-prebuild.vcxproj +++ b/win32/vs12/gtk4-prebuild.vcxproj @@ -147,49 +147,49 @@ - + Copying config.h from config.h.win32... $(GenConfigH) - ..\..\..\config.h;%(Outputs) + ..\..\config.h;%(Outputs) Copying config.h from config.h.win32... $(GenConfigH) - ..\..\..\config.h;%(Outputs) + ..\..\config.h;%(Outputs) Copying config.h from config.h.win32... $(GenConfigH) - ..\..\..\config.h;%(Outputs) + ..\..\config.h;%(Outputs) Copying config.h from config.h.win32... $(GenConfigH) - ..\..\..\config.h;%(Outputs) + ..\..\config.h;%(Outputs) - + Copying gdkconfig from gdkconfig.win32... $(GenGdkConfigHWin32) - ..\..\..\gdk\gdkconfig.h;..\..\..\GDK_WIN32ONLY_BUILD;..\..\..\MSVC_$(Configuration);%(Outputs) + ..\..\gdk\gdkconfig.h;..\..\GDK_WIN32ONLY_BUILD;..\..\MSVC_$(Configuration);%(Outputs) Copying gdkconfig from gdkconfig.win32... $(GenGdkConfigHWin32) - ..\..\..\gdk\gdkconfig.h;..\..\..\GDK_WIN32ONLY_BUILD;..\..\..\MSVC_$(Configuration);%(Outputs) + ..\..\gdk\gdkconfig.h;..\..\GDK_WIN32ONLY_BUILD;..\..\MSVC_$(Configuration);%(Outputs) - + Copying gdkconfig from gdkconfig.win32_vulkan... $(GenGdkConfigHVulkan) - ..\..\..\gdk\gdkconfig.h;..\..\..\GDK_VULKAN_BUILD;..\..\..\MSVC_$(Configuration)_Vulkan;%(Outputs) + ..\..\gdk\gdkconfig.h;..\..\GDK_VULKAN_BUILD;..\..\MSVC_$(Configuration)_Vulkan;%(Outputs) Copying gdkconfig from gdkconfig.win32_vulkan... $(GenGdkConfigHVulkan) - ..\..\..\gdk\gdkconfig.h;..\..\..\GDK_VULKAN_BUILD;..\..\..\MSVC_$(Configuration)_Vulkan;%(Outputs) + ..\..\gdk\gdkconfig.h;..\..\GDK_VULKAN_BUILD;..\..\MSVC_$(Configuration)_Vulkan;%(Outputs) - + Copying demos.h from demos.h.win32... $(CopyDemosH) - ..\..\..\demos\gtk-demo\demos.h;%(Outputs) + ..\..\demos\gtk-demo\demos.h;%(Outputs) Copying demos.h from demos.h.win32... $(CopyDemosH) - ..\..\..\demos\gtk-demo\demos.h;%(Outputs) + ..\..\demos\gtk-demo\demos.h;%(Outputs) Copying demos.h from demos.h.win32... $(CopyDemosH) - ..\..\..\demos\gtk-demo\demos.h;%(Outputs) + ..\..\demos\gtk-demo\demos.h;%(Outputs) Copying demos.h from demos.h.win32... $(CopyDemosH) - ..\..\..\demos\gtk-demo\demos.h;%(Outputs) + ..\..\demos\gtk-demo\demos.h;%(Outputs) diff --git a/build/win32/vs12/gtk4-prebuild.vcxproj.filters b/win32/vs12/gtk4-prebuild.vcxproj.filters similarity index 50% rename from build/win32/vs12/gtk4-prebuild.vcxproj.filters rename to win32/vs12/gtk4-prebuild.vcxproj.filters index d776972de3..a9c86e099e 100644 --- a/build/win32/vs12/gtk4-prebuild.vcxproj.filters +++ b/win32/vs12/gtk4-prebuild.vcxproj.filters @@ -7,9 +7,9 @@ - Resource Files - Resource Files - Resource Files - Resource Files + Resource Files + Resource Files + Resource Files + Resource Files diff --git a/build/win32/vs12/gtk4-query-settings.vcxproj b/win32/vs12/gtk4-query-settings.vcxproj similarity index 99% rename from build/win32/vs12/gtk4-query-settings.vcxproj rename to win32/vs12/gtk4-query-settings.vcxproj index 7f6de6dcc7..ad315b1eb0 100644 --- a/build/win32/vs12/gtk4-query-settings.vcxproj +++ b/win32/vs12/gtk4-query-settings.vcxproj @@ -161,7 +161,7 @@ - + diff --git a/build/win32/vs12/gtk4-update-icon-cache.vcxproj.filters b/win32/vs12/gtk4-query-settings.vcxproj.filters similarity index 93% rename from build/win32/vs12/gtk4-update-icon-cache.vcxproj.filters rename to win32/vs12/gtk4-query-settings.vcxproj.filters index 24d654bd72..6e14aacf20 100644 --- a/build/win32/vs12/gtk4-update-icon-cache.vcxproj.filters +++ b/win32/vs12/gtk4-query-settings.vcxproj.filters @@ -15,6 +15,6 @@ - Sources + Sources diff --git a/build/win32/vs12/gtk4-update-icon-cache.vcxproj b/win32/vs12/gtk4-update-icon-cache.vcxproj similarity index 99% rename from build/win32/vs12/gtk4-update-icon-cache.vcxproj rename to win32/vs12/gtk4-update-icon-cache.vcxproj index c68465baf7..efd4cb4837 100644 --- a/build/win32/vs12/gtk4-update-icon-cache.vcxproj +++ b/win32/vs12/gtk4-update-icon-cache.vcxproj @@ -161,7 +161,7 @@ - + diff --git a/win32/vs12/gtk4-update-icon-cache.vcxproj.filters b/win32/vs12/gtk4-update-icon-cache.vcxproj.filters new file mode 100644 index 0000000000..f62b142f16 --- /dev/null +++ b/win32/vs12/gtk4-update-icon-cache.vcxproj.filters @@ -0,0 +1,20 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + + Sources + + diff --git a/build/win32/vs12/gtk4-version-paths.props.in b/win32/vs12/gtk4-version-paths.props.in similarity index 94% rename from build/win32/vs12/gtk4-version-paths.props.in rename to win32/vs12/gtk4-version-paths.props.in index be750d4874..3b1da887a6 100644 --- a/build/win32/vs12/gtk4-version-paths.props.in +++ b/win32/vs12/gtk4-version-paths.props.in @@ -2,8 +2,8 @@ 12 - $(SolutionDir)\..\..\..\..\vs$(VSVer)\$(Platform) - ..\..\..\..\vs$(VSVer)\$(Platform) + $(SolutionDir)\..\..\..\vs$(VSVer)\$(Platform) + ..\..\..\vs$(VSVer)\$(Platform) 4 $(ApiVersionShort).0 @GTK_VERSION@ diff --git a/build/win32/vs14/Makefile.am b/win32/vs14/Makefile.am similarity index 96% rename from build/win32/vs14/Makefile.am rename to win32/vs14/Makefile.am index 7ffc804d7d..d23b1477d5 100644 --- a/build/win32/vs14/Makefile.am +++ b/win32/vs14/Makefile.am @@ -42,6 +42,6 @@ MSVC_VER = 14 MSVC_FORMAT_VER = 12 MSVC_VER_LONG = 14 -include $(top_srcdir)/build/Makefile-newvs.am +include $(top_srcdir)/win32/Makefile-newvs.am -include $(top_srcdir)/git.mk -- 2.30.2